diff options
| author | Alan Conway <aconway@apache.org> | 2009-01-08 22:32:10 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-01-08 22:32:10 +0000 |
| commit | 92cbb60068d48c36108cb9e3ec436d2808428d15 (patch) | |
| tree | 1934743704fc121abb573e6229e475a5b5f05c66 /cpp/src | |
| parent | c27590353a30ea036f7b2614bfc0ef73a3402140 (diff) | |
| download | qpid-python-92cbb60068d48c36108cb9e3ec436d2808428d15.tar.gz | |
Fix for compatibility with latest corosync.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@732854 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/cluster/Cpg.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/cpp/src/qpid/cluster/Cpg.cpp index 3b7e82a751..b002400cb3 100644 --- a/cpp/src/qpid/cluster/Cpg.cpp +++ b/cpp/src/qpid/cluster/Cpg.cpp @@ -141,21 +141,22 @@ void Cpg::dispatchBlocking() { string Cpg::errorStr(cpg_error_t err, const std::string& msg) { switch (err) { case CPG_OK: return msg+": ok"; - case CPG_ERR_LIBRARY: return msg+": library error"; case CPG_ERR_TIMEOUT: return msg+": timeout"; - case CPG_ERR_TRY_AGAIN: return msg+": timeout."; + case CPG_ERR_TRY_AGAIN: return msg+": timeout. The aisexec daemon may not be running"; case CPG_ERR_INVALID_PARAM: return msg+": invalid param"; case CPG_ERR_NO_MEMORY: return msg+": no memory"; case CPG_ERR_BAD_HANDLE: return msg+": bad handle"; - case CPG_ERR_ACCESS: return msg+": access denied."; + case CPG_ERR_ACCESS: return msg+": access denied. You may need to set your group ID to 'ais'"; case CPG_ERR_NOT_EXIST: return msg+": not exist"; case CPG_ERR_EXIST: return msg+": exist"; case CPG_ERR_NOT_SUPPORTED: return msg+": not supported"; - case CPG_ERR_SECURITY: return msg+": security"; - case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups"; + // The following are not mapped, or are incorrectly mapped in corosync 0-92-5 + // case CPG_ERR_LIBRARY: return msg+": library"; + // case CPG_ERR_SECURITY: return msg+": security"; + // case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups"; + default: - assert(0); - return ": unknown"; + return ": cpg error"; }; } |