diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-11-07 02:08:51 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-11-07 02:08:51 +0000 |
| commit | 091d2bcb00cd90b04c57e40638863ea5069e9df3 (patch) | |
| tree | a4de30e19f5ea8fbe3f2f99a278040328eb80b8f /src/ejabberd_sup.erl | |
| parent | * src/odbc/mysql.sql: Fix database creation script. (diff) | |
* src/ejabberd_node_groups.erl: Support for node tagging
* src/ejabberd_sup.erl: Likewise
* src/ejabberd_frontend_socket.erl: Use node tags to determine
backend nodes
* src/ejabberd_config.erl: Added node_type and cluster_nodes
options
* src/ejabberd_app.erl: Establish connections to the nodes from
the cluster_nodes option
* src/ejabberd_router.erl: Added balancing method option
* src/ejabberd_config.erl: Likewise
SVN Revision: 676
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_sup.erl | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index 1e6851dc2..e093b6a2b 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -33,6 +33,13 @@ init([]) -> brutal_kill, worker, [stringprep]}, + NodeGroups = + {ejabberd_node_groups, + {ejabberd_node_groups, start_link, []}, + permanent, + brutal_kill, + worker, + [ejabberd_node_groups]}, Router = {ejabberd_router, {ejabberd_router, start_link, []}, @@ -123,6 +130,14 @@ init([]) -> infinity, supervisor, [ejabberd_tmp_sup]}, + FrontendSocketSupervisor = + {ejabberd_frontend_socket_sup, + {ejabberd_tmp_sup, start_link, + [ejabberd_frontend_socket_sup, ejabberd_frontend_socket]}, + permanent, + infinity, + supervisor, + [ejabberd_tmp_sup]}, IQSupervisor = {ejabberd_iq_sup, {ejabberd_tmp_sup, start_link, @@ -134,6 +149,7 @@ init([]) -> {ok, {{one_for_one, 10, 1}, [Hooks, StringPrep, + NodeGroups, Router, SM, S2S, @@ -146,6 +162,7 @@ init([]) -> HTTPSupervisor, HTTPPollSupervisor, IQSupervisor, + FrontendSocketSupervisor, Listener]}}. |