Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Handler module shouldn't be used for differentiating listeners when merging configs

This commit is contained in:
Paweł Chmielowski 2015-10-07 16:44:49 +02:00
parent 880114a909
commit 6d25db6600
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ejabberd_config.erl
View File

@ -373,17 +373,15 @@ exit_or_halt(ExitText) ->
get_config_option_key(Name, Val) ->
if Name == listen ->
lists:foldl(
fun({port, Port}, {_, IP, T, Mod}) ->
{Port, IP, T, Mod};
({ip, IP}, {Port, _, T, Mod}) ->
{Port, IP, T, Mod};
({transport, T}, {Port, IP, _, Mod}) ->
{Port, IP, T, Mod};
({module, Mod}, {Port, IP, T, _}) ->
{Port, IP, T, Mod};
fun({port, Port}, {_, IP, T}) ->
{Port, IP, T};
({ip, IP}, {Port, _, T}) ->
{Port, IP, T};
({transport, T}, {Port, IP, _}) ->
{Port, IP, T};
(_, Res) ->
Res
end, {5222, {0,0,0,0}, tcp, ejabberd_c2s}, Val);
end, {5222, {0,0,0,0}, tcp}, Val);
is_tuple(Val) ->
element(1, Val);
true ->