diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-11-04 14:37:38 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-11-04 14:37:38 +0000 |
| commit | f09d5a347749b7d5520a3a3d6f0766fe8e2a213e (patch) | |
| tree | 2bb4166ef5608774b76d547b9411d1f8b07f2ecb /qpid/cpp/src | |
| parent | b6c399944995c33ac199bec28f81a43c0bb52eaa (diff) | |
| download | qpid-python-f09d5a347749b7d5520a3a3d6f0766fe8e2a213e.tar.gz | |
Changed default timeout for daemon to 10 min to allow for long store recovery times.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@832762 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/posix/QpiddBroker.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Daemon.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp index 083b79896e..7eef187ded 100644 --- a/qpid/cpp/src/posix/QpiddBroker.cpp +++ b/qpid/cpp/src/posix/QpiddBroker.cpp @@ -59,7 +59,7 @@ struct DaemonOptions : public qpid::Options { std::string piddir; std::string transport; - DaemonOptions() : qpid::Options("Daemon options"), daemon(false), quit(false), check(false), wait(10), transport(TCP) + DaemonOptions() : qpid::Options("Daemon options"), daemon(false), quit(false), check(false), wait(600), transport(TCP) { char *home = ::getenv("HOME"); diff --git a/qpid/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp index 21848e23de..e1d400e01b 100644 --- a/qpid/cpp/src/qpid/broker/Daemon.cpp +++ b/qpid/cpp/src/qpid/broker/Daemon.cpp @@ -123,7 +123,7 @@ uint16_t Daemon::wait(int timeout) { // parent waits for child. FD_ZERO(&fds); FD_SET(pipeFds[0], &fds); int n=select(FD_SETSIZE, &fds, 0, 0, &tv); - if(n==0) throw Exception("Timed out waiting for daemon"); + if(n==0) throw Exception("Timed out waiting for daemon (If store recovery is in progress, use longer wait time)"); if(n<0) throw ErrnoException("Error waiting for daemon"); uint16_t port = 0; /* |