diff options
| author | Pablo Polvorin <ppolvorin@process-one.net> | 2016-02-04 15:45:29 -0300 |
|---|---|---|
| committer | Pablo Polvorin <ppolvorin@process-one.net> | 2016-02-04 15:45:29 -0300 |
| commit | 942072cf9d7bfaab4b35e2414dceb75a671cfe1a (patch) | |
| tree | 1eb757154c1da2872920cb81d9af888add90c09c | |
| parent | Merge pull request #943 from processone/deps-cleanup (diff) | |
Make hibernate timeouts configurable
Two *global* options added:
c2s_hibernate and receiver_hibernate.
Default if not specified is 90000, the previous hardcoded value.
| -rw-r--r-- | src/ejabberd_c2s.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_receiver.erl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index ad7590eb..19fde38f 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -133,7 +133,7 @@ %% session: -define(C2S_OPEN_TIMEOUT, 60000). --define(C2S_HIBERNATE_TIMEOUT, 90000). +-define(C2S_HIBERNATE_TIMEOUT, ejabberd_config:get_option(c2s_hibernate, fun(X) when is_integer(X); X == hibernate-> X end, 90000)). -define(STREAM_HEADER, <<"<?xml version='1.0'?><stream:stream " diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl index 6189c433..9fdc86f8 100644 --- a/src/ejabberd_receiver.erl +++ b/src/ejabberd_receiver.erl @@ -56,7 +56,8 @@ xml_stream_state :: fxml_stream:xml_stream_state(), timeout = infinity:: timeout()}). --define(HIBERNATE_TIMEOUT, 90000). +-define(HIBERNATE_TIMEOUT, ejabberd_config:get_option(receiver_hibernate, fun(X) when is_integer(X); X == hibernate-> X end, 90000)). + -spec start_link(inet:socket(), atom(), shaper:shaper(), non_neg_integer() | infinity) -> ignore | |