svn commit: r732854 - /qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp

[ac...@apache.org]

Author: aconway
Date: Thu Jan  8 14:32:10 2009
New Revision: 732854

URL: http://svn.apache.org/viewvc?rev=732854&view=rev
Log:
Fix for compatibility with latest corosync.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp?rev=732854&r1=732853&r2=732854&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp Thu Jan  8 14:32:10 2009
@@ -141,21 +141,22 @@
 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";
     };
 }