diff options
| author | Alan Conway <aconway@apache.org> | 2012-05-14 19:45:04 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-05-14 19:45:04 +0000 |
| commit | c98258ad72def817c3ee55fbddef488a5f0605ed (patch) | |
| tree | 6e66f376d6a3b35ec1e84eea311b0c946b71f65c /qpid/cpp/src/posix | |
| parent | be245407d6738e33a65770bb69db568105c352b1 (diff) | |
| download | qpid-python-c98258ad72def817c3ee55fbddef488a5f0605ed.tar.gz | |
NO-JIRA: Reduce message for missing lock file from critical to notice.
If qpidd -q can't find the lock file, it used to issue a critical error message.
This is to harsh, not finding the lock file usually just means the broker isn't running.
Demoted to a notice message.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1338365 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/posix')
| -rw-r--r-- | qpid/cpp/src/posix/QpiddBroker.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qpid/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp index fd2fb6184f..76e3bb6674 100644 --- a/qpid/cpp/src/posix/QpiddBroker.cpp +++ b/qpid/cpp/src/posix/QpiddBroker.cpp @@ -154,8 +154,14 @@ int QpiddBroker::execute (QpiddOptions *options) { throw Exception("Internal error obtaining platform options"); if (myOptions->daemon.check || myOptions->daemon.quit) { - pid_t pid = Daemon::getPid(myOptions->daemon.piddir, - options->broker.port); + pid_t pid; + try { + pid = Daemon::getPid(myOptions->daemon.piddir, options->broker.port); + } catch (const ErrnoException& e) { + // This is not a critical error, usually means broker is not running + QPID_LOG(notice, "Cannot stop broker: " << e.what()); + return 1; + } if (pid < 0) return 1; if (myOptions->daemon.check) |