From 091d2bcb00cd90b04c57e40638863ea5069e9df3 Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Tue, 7 Nov 2006 02:08:51 +0000
Subject: * 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
---
 src/ejabberd_sup.erl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/ejabberd_sup.erl')

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]}}.
 
 
-- 
cgit v1.2.3