diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-01-16 18:50:29 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-01-16 18:50:29 +0000 |
| commit | cfa5b020ca65bc8f022aaffed71d1143478c6825 (patch) | |
| tree | c7835fe879adf2ebe6151087451e732f33254120 | |
| parent | f1e9ae878d06b44c8d572d8c74065761d0b4a467 (diff) | |
| parent | 5dd79aa4d84fb041bd5d1e23204c4a84712e534c (diff) | |
| download | rabbitmq-server-git-cfa5b020ca65bc8f022aaffed71d1143478c6825.tar.gz | |
Merge bug 24638
| -rw-r--r-- | ebin/rabbit_app.in | 1 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 5ead105145..78c97b25fa 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -42,5 +42,6 @@ {reuseaddr, true}, {backlog, 128}, {nodelay, true}, + {linger, {true, 0}, {exit_on_close, false}]} ]}]}. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index ff5eac21f0..fce61129fa 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -31,7 +31,7 @@ -define(HANDSHAKE_TIMEOUT, 10). -define(NORMAL_TIMEOUT, 3). --define(CLOSING_TIMEOUT, 1). +-define(CLOSING_TIMEOUT, 30). -define(CHANNEL_TERMINATION_TIMEOUT, 3). -define(SILENT_CLOSE_DELAY, 3). |