diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-08-20 17:47:04 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-08-20 17:47:04 +0400 |
| commit | 33e0bf1c19cb89253bda02f148584c81efeba607 (patch) | |
| tree | 0179c2de307b35e3e32bf0140d347cbf475374ab | |
| parent | Merge pull request #282 from weiss/fix-muc-option-docs (diff) | |
| parent | Allow for "max_ack_queue: infinity", as documented (diff) | |
Merge pull request #283 from weiss/allow-unlimited-ack-queue
Support "max_ack_queue: infinity"
| -rw-r--r-- | src/ejabberd_c2s.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 368aacb39..cccd41b07 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -307,6 +307,7 @@ init([{SockMod, Socket}, Opts]) -> end, MaxAckQueue = case proplists:get_value(max_ack_queue, Opts) of Limit when is_integer(Limit), Limit > 0 -> Limit; + infinity -> infinity; _ -> 500 end, ResumeTimeout = case proplists:get_value(resume_timeout, Opts) of @@ -2789,9 +2790,7 @@ mgmt_queue_drop(StateData, NumHandled) -> StateData#state.mgmt_queue), StateData#state{mgmt_queue = NewQueue}. -check_queue_length(#state{mgmt_max_queue = Limit} = StateData) - when Limit == infinity; - Limit == unlimited -> +check_queue_length(#state{mgmt_max_queue = infinity} = StateData) -> StateData; check_queue_length(#state{mgmt_queue = Queue, mgmt_max_queue = Limit} = StateData) -> |