summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_listener.erl15
2 files changed, 4 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e836d3a..ff4a32ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-11 Badlop <badlop@process-one.net>
+
+ * src/ejabberd_listener.erl (start_listener): Revert SVN r1260.
+
2008-04-11 Alexey Shchepin <alexey@process-one.net>
* src/ejabberd_config.erl: Removed a dependency on string:to_upper
diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl
index 98b90861..b65a3378 100644
--- a/src/ejabberd_listener.erl
+++ b/src/ejabberd_listener.erl
@@ -130,21 +130,6 @@ accept(ListenSocket, Module, Opts) ->
end.
start_listener(Port, Module, Opts) ->
- start_module_sup(Module),
- start_listener_sup(Port, Module, Opts).
-
-start_module_sup(Module) ->
- Proc = gen_mod:get_module_proc("sup", Module),
- ChildSpec =
- {Proc,
- {ejabberd_tmp_sup, start_link, [Proc, Module]},
- permanent,
- infinity,
- supervisor,
- [ejabberd_tmp_sup]},
- supervisor:start_child(ejabberd_sup, ChildSpec).
-
-start_listener_sup(Port, Module, Opts) ->
ChildSpec = {Port,
{?MODULE, start, [Port, Module, Opts]},
transient,