summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-02-04 14:30:23 +0000
committerAlan Conway <aconway@apache.org>2009-02-04 14:30:23 +0000
commit366aa9340712308b6ead089f1d9cd82b2bf30b1c (patch)
treec5b8c5bf52b78463fba3f43405f2c57b85450714
parentd71457233eb57af17dea2e5d1dc56fdc4497da6a (diff)
downloadqpid-python-366aa9340712308b6ead089f1d9cd82b2bf30b1c.tar.gz
Clean up error messages.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@740756 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/cluster/Cpg.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cpg.cpp b/qpid/cpp/src/qpid/cluster/Cpg.cpp
index 5ab69976d8..cc12328d97 100644
--- a/qpid/cpp/src/qpid/cluster/Cpg.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cpg.cpp
@@ -143,21 +143,21 @@ string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
std::ostringstream os;
os << msg << ": ";
switch (err) {
- case CPG_OK: os << ": ok"; break;
- case CPG_ERR_TIMEOUT: os << ": timeout"; break;
- case CPG_ERR_TRY_AGAIN: os << ": timeout. The aisexec daemon may not be running"; break;
- case CPG_ERR_INVALID_PARAM: os << ": invalid param"; break;
- case CPG_ERR_NO_MEMORY: os << ": no memory"; break;
- case CPG_ERR_BAD_HANDLE: os << ": bad handle"; break;
- case CPG_ERR_ACCESS: os << ": access denied. You may need to set your group ID to 'ais'"; break;
- case CPG_ERR_NOT_EXIST: os << ": not exist"; break;
- case CPG_ERR_EXIST: os << ": exist"; break;
- case CPG_ERR_NOT_SUPPORTED: os << ": not supported"; break;
+ case CPG_OK: os << "ok"; break;
+ case CPG_ERR_TIMEOUT: os << "timeout"; break;
+ case CPG_ERR_TRY_AGAIN: os << "timeout. The aisexec daemon may not be running"; break;
+ case CPG_ERR_INVALID_PARAM: os << "invalid param"; break;
+ case CPG_ERR_NO_MEMORY: os << "no memory"; break;
+ case CPG_ERR_BAD_HANDLE: os << "bad handle"; break;
+ case CPG_ERR_ACCESS: os << "access denied. You may need to set your group ID to 'ais'"; break;
+ case CPG_ERR_NOT_EXIST: os << "not exist"; break;
+ case CPG_ERR_EXIST: os << "exist"; break;
+ case CPG_ERR_NOT_SUPPORTED: os << "not supported"; break;
// The following are not mapped, or are incorrectly mapped in corosync 0-92-5
- // case CPG_ERR_LIBRARY: os << ": library"; break;
- // case CPG_ERR_SECURITY: os << ": security"; break;
- // case CPG_ERR_TOO_MANY_GROUPS: os << ": too many groups"; break;
- default: os << ": unknown cpg error";
+ // case CPG_ERR_LIBRARY: os << "library"; break;
+ // case CPG_ERR_SECURITY: os << "security"; break;
+ // case CPG_ERR_TOO_MANY_GROUPS: os << "too many groups"; break;
+ default: os << ": unknown cpg error " << err;
};
os << " (" << err << ")";
return os.str();