Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Fix mod_multicast start and reading of configured limits (#1949)

Browse Source
This commit is contained in:
Badlop 2017-08-18 14:09:49 +02:00
parent ee0a8d2966
commit 0b02d42836
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_multicast.erl
View File

@ -998,8 +998,10 @@ build_service_limit_record(LimitOpts) ->
build_limit_record(LimitOptsR, remote)}. build_limit_record(LimitOptsR, remote)}.
get_from_limitopts(LimitOpts, SenderT) -> get_from_limitopts(LimitOpts, SenderT) ->
{SenderT, Result} = lists:keyfind(SenderT, 1, LimitOpts), case lists:keyfind(SenderT, 1, LimitOpts) of
Result. false -> [];
{SenderT, Result} -> Result
end.
build_remote_limit_record(LimitOpts, SenderT) -> build_remote_limit_record(LimitOpts, SenderT) ->
build_limit_record(LimitOpts, SenderT). build_limit_record(LimitOpts, SenderT).
@ -1120,10 +1122,10 @@ mod_opt_type(host) -> fun iolist_to_binary/1;
mod_opt_type({limits, Type}) when (Type == local) or (Type == remote) -> mod_opt_type({limits, Type}) when (Type == local) or (Type == remote) ->
fun(L) -> fun(L) ->
lists:map( lists:map(
fun ({message, infinite}) -> infinite; fun ({message, infinite} = O) -> O;
({presence, infinite}) -> infinite; ({presence, infinite} = O) -> O;
({message, I}) when is_integer(I) -> I; ({message, I} = O) when is_integer(I) -> O;
({presence, I}) when is_integer(I) -> I ({presence, I} = O) when is_integer(I) -> O
end, L) end, L)
end; end;
mod_opt_type(_) -> [access, host, {limits, local}, {limits, remote}]. mod_opt_type(_) -> [access, host, {limits, local}, {limits, remote}].