25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

Merge 1891 from trunk.

* src/ejabberd_listener.erl: When stopping a listener, don't stop
the listener supervisor (EJAB-874)

SVN Revision: 1953
This commit is contained in:
Badlop 2009-03-03 19:43:55 +00:00
parent 9a7c6b8be1
commit dbf0bb209d
2 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,8 @@
2009-03-03 Badlop <badlop@process-one.net> 2009-03-03 Badlop <badlop@process-one.net>
* src/ejabberd_listener.erl: When stopping a listener, don't stop
the listener supervisor (EJAB-874)
* src/ejabberd_listener.erl: More error detections * src/ejabberd_listener.erl: More error detections
* src/ejabberd_config.erl: Check certfiles are readable on server * src/ejabberd_config.erl: Check certfiles are readable on server

View File

@ -260,10 +260,7 @@ start_listener_sup(Port, Module, Opts) ->
stop_listener(Port, Module) -> stop_listener(Port, Module) ->
supervisor:terminate_child(ejabberd_listeners, Port), supervisor:terminate_child(ejabberd_listeners, Port),
supervisor:delete_child(ejabberd_listeners, Port), supervisor:delete_child(ejabberd_listeners, Port).
Proc1 = gen_mod:get_module_proc("sup", Module),
supervisor:terminate_child(ejabberd_sup, Proc1),
supervisor:delete_child(ejabberd_sup, Proc1).
%% @spec (PortIP, Module, Opts) -> {ok, Pid} | {error, Error} %% @spec (PortIP, Module, Opts) -> {ok, Pid} | {error, Error}
%% where %% where