summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-08-24 21:30:16 +0000
committerAlan Conway <aconway@apache.org>2009-08-24 21:30:16 +0000
commitc411874471352ab40344d49ddf779e5df82a634d (patch)
tree486c58392373f25adfab08d7149a5b66f8f9378d
parent9f259229d66b42a9453cfb584cc1157b6e81550b (diff)
downloadqpid-python-c411874471352ab40344d49ddf779e5df82a634d.tar.gz
Fix misleading log messages.
Changed "startup failed" to "unexpected error" as the messages are used for any exception thrown out of Broker::run() not just startup. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@807389 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/Daemon.cpp2
-rw-r--r--qpid/cpp/src/qpidd.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp
index aa8dd8855b..21848e23de 100644
--- a/qpid/cpp/src/qpid/broker/Daemon.cpp
+++ b/qpid/cpp/src/qpid/broker/Daemon.cpp
@@ -85,7 +85,7 @@ void Daemon::fork()
child();
}
catch (const exception& e) {
- QPID_LOG(critical, "Daemon startup failed: " << e.what());
+ QPID_LOG(critical, "Unexpected error: " << e.what());
uint16_t port = 0;
int unused_ret; //Supress warning about ignoring return value.
unused_ret = write(pipeFds[1], &port, sizeof(uint16_t));
diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index 9c3c6b0c4b..1839a62205 100644
--- a/qpid/cpp/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
return broker.execute(options.get());
}
catch(const exception& e) {
- QPID_LOG(critical, "Broker start-up failed: " << e.what());
+ QPID_LOG(critical, "Unexpected error: " << e.what());
}
return 1;
}