diff options
| author | Justin Ross <jross@apache.org> | 2012-09-06 17:39:41 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2012-09-06 17:39:41 +0000 |
| commit | 2b1afdfde49de5678619b04f85059c3a7443fe20 (patch) | |
| tree | 285f8bfc0ec99d0e6e6b55bc649da97d9164b898 /qpid/cpp/src | |
| parent | b081663c3b7c2f6394d2a432188541c078576556 (diff) | |
| download | qpid-python-2b1afdfde49de5678619b04f85059c3a7443fe20.tar.gz | |
QPID-2518: Increase default negotiation timeout to 10 seconds
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1381690 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index 03ad88a4a8..c67d06f50c 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -130,7 +130,7 @@ Broker::Options::Options(const std::string& name) : timestampRcvMsgs(false), // set the 0.10 timestamp delivery property linkMaintenanceInterval(2), linkHeartbeatInterval(120), - maxNegotiateTime(2000) // 2s + maxNegotiateTime(10000) // 10s { int c = sys::SystemInfo::concurrency(); workerThreads=c+1; @@ -171,7 +171,7 @@ Broker::Options::Options(const std::string& name) : ("enable-timestamp", optValue(timestampRcvMsgs, "yes|no"), "Add current time to each received message.") ("link-maintenace-interval", optValue(linkMaintenanceInterval, "SECONDS")) ("link-heartbeat-interval", optValue(linkHeartbeatInterval, "SECONDS")) - ("max-negotiate-time", optValue(maxNegotiateTime, "MilliSeconds"), "Maximum time a connection can take to send the initial protocol negotiation") + ("max-negotiate-time", optValue(maxNegotiateTime, "MILLISECONDS"), "Maximum time a connection can take to send the initial protocol negotiation") ("federation-tag", optValue(fedTag, "NAME"), "Override the federation tag") ; } |