From dbf0bb209d1b6bf7a007b6ad59bbe8885bd20311 Mon Sep 17 00:00:00 2001 From: Badlop Date: Tue, 3 Mar 2009 19:43:55 +0000 Subject: [PATCH] Merge 1891 from trunk. * src/ejabberd_listener.erl: When stopping a listener, don't stop the listener supervisor (EJAB-874) SVN Revision: 1953 --- ChangeLog | 3 +++ src/ejabberd_listener.erl | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a23343da..1218515a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-03-03 Badlop + * 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_config.erl: Check certfiles are readable on server diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 337267726..4a75a7cb4 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -260,10 +260,7 @@ start_listener_sup(Port, Module, Opts) -> stop_listener(Port, Module) -> supervisor:terminate_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). + supervisor:delete_child(ejabberd_listeners, Port). %% @spec (PortIP, Module, Opts) -> {ok, Pid} | {error, Error} %% where