From 2802b6cee279786e8521e83a06bd9661470fad52 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Wed, 20 Aug 2014 12:53:26 +0200 Subject: [PATCH] Allow for "max_ack_queue: infinity", as documented --- src/ejabberd_c2s.erl | 5 ++--- 1 file 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) ->