diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2015-09-01 10:56:43 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2015-09-01 10:57:48 +0200 |
| commit | e24bfe7b62017b33db17141d154e747e89035f33 (patch) | |
| tree | ae2c4bcc36b94d41211ac735f2d0900840e3c118 | |
| parent | Fetch MUC MAM messages from room history directly if it's not enabled in room... (diff) | |
Fix problem with merging same port, different ip listeners in config files
Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.
| -rw-r--r-- | src/ejabberd_config.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 89e1399fa..e17685810 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -370,10 +370,8 @@ exit_or_halt(ExitText) -> get_config_option_key(Name, Val) -> if Name == listen -> - case {lists:keyfind(port, 1, Val), lists:keyfind(transport, 1, Val)} of - {{_, Port}, false} -> {Port, tcp}; - {{_, Port2}, {_, Trans}} -> {Port2, Trans} - end; + [{Key, _, _}] = ejabberd_listener:validate_cfg([Val]), + Key; is_tuple(Val) -> element(1, Val); true -> |