diff options
| author | Evgeniy Khramtsov <xramtsov@gmail.com> | 2010-01-28 13:44:49 +0000 |
|---|---|---|
| committer | Evgeniy Khramtsov <xramtsov@gmail.com> | 2010-01-28 13:44:49 +0000 |
| commit | 0a3cfeeed9c6efbcc9dc43dc19bb9c23289b560b (patch) | |
| tree | 5c43af6563ddb260444f99bc1d2560bf81377aa3 | |
| parent | fixes regression with configure script (diff) | |
new ejabberd_c2s option support: max_fsm_queue
SVN Revision: 2939
| -rw-r--r-- | src/ejabberd_c2s.erl | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index e956c9533..3726db29f 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -107,7 +107,7 @@ %% Module start with or without supervisor: -ifdef(NO_TRANSIENT_SUPERVISORS). -define(SUPERVISOR_START, ?GEN_FSM:start(ejabberd_c2s, [SockData, Opts], - fsm_limit_opts() ++ ?FSMOPTS)). + fsm_limit_opts(Opts) ++ ?FSMOPTS)). -else. -define(SUPERVISOR_START, supervisor:start_child(ejabberd_c2s_sup, [SockData, Opts])). @@ -143,7 +143,7 @@ start(SockData, Opts) -> start_link(SockData, Opts) -> ?GEN_FSM:start_link(ejabberd_c2s, [SockData, Opts], - fsm_limit_opts() ++ ?FSMOPTS). + fsm_limit_opts(Opts) ++ ?FSMOPTS). socket_type() -> xml_stream. @@ -2156,12 +2156,17 @@ check_from(El, FromJID) -> end end. -fsm_limit_opts() -> - case ejabberd_config:get_local_option(max_fsm_queue) of - N when is_integer(N) -> +fsm_limit_opts(Opts) -> + case lists:keysearch(max_fsm_queue, 1, Opts) of + {value, {_, N}} when is_integer(N) -> [{max_queue, N}]; _ -> - [] + case ejabberd_config:get_local_option(max_fsm_queue) of + N when is_integer(N) -> + [{max_queue, N}]; + _ -> + [] + end end. %%%---------------------------------------------------------------------- |