Cleaning up multiple manager supports

This now works using gproc instead of list_to_atom. This is done using gproc and adds a dependency, warranting a version bump from 1 to 1.1
yrashk · Mar 10, 2012 · ad4b319 · ad4b319
1 parent a7a1a7c
commit ad4b319
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 38 deletions.
diff --git a/demo/demo.erl b/demo/demo.erl
@@ -1,5 +1,5 @@
 #! /usr/bin/env escript
-%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin 
+%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin ../deps/gproc/ebin/
 -mode(compile).
 -include_lib("../include/socketio.hrl").
 -compile(export_all).
@@ -12,6 +12,7 @@
 main(_) ->
     appmon:start(),
     application:start(sasl),
+    application:start(gproc),
     application:start(misultin),
     application:start(socketio),
     {ok, Pid} = socketio_listener:start([{http_port, 7878}, 

diff --git a/demo/demo_ssl.erl b/demo/demo_ssl.erl
@@ -1,5 +1,5 @@
 #! /usr/bin/env escript
-%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin 
+%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin ../deps/gproc/ebin
 -mode(compile).
 -include_lib("../include/socketio.hrl").
 -compile(export_all).
@@ -12,6 +12,7 @@
 main(_) ->
     appmon:start(),
     application:start(sasl),
+    application:start(gproc),
     application:start(misultin),
     application:start(socketio),
     {ok, Pid} = socketio_listener:start([{http_port, 7878}, 

diff --git a/src/socketio.app.src b/src/socketio.app.src
@@ -1,13 +1,14 @@
 {application, socketio,
  [
   {description, ""},
-  {vsn, "1"},
+  {vsn, "1.1"},
   {registered, []},
-  {agner, [{requires, ["misultin", "ossp_uuid",{"jsx","0.9.0"},"proper","ex_uri"]}]},
+  {agner, [{requires, ["misultin", "ossp_uuid",{"jsx","0.9.0"},"proper","ex_uri", "gproc"]}]},
   {applications, [
                   kernel,
                   stdlib,
-		  misultin
+                  gproc,
+                  misultin
                  ]},
   {mod, { socketio_app, []}},
   {env, [{heartbeat_interval, 10000},

diff --git a/src/socketio_client.erl b/src/socketio_client.erl
@@ -20,9 +20,7 @@ start_link(Sup, Module, SessionId, ServerModule, ConnectionReference) ->
     Module:start_link(Sup, SessionId, ServerModule, ConnectionReference).
 
 start(Sup0, Module, SessionId, ServerModule, ConnectionReference, Port) ->
-    Children = supervisor:which_children(Sup0),
-    Name = list_to_atom(atom_to_list(socketio_client_sup) ++ "_" ++ integer_to_list(Port)),
-    {Sup, _, _, _} = lists:keyfind(Name ,1, Children),
+    Sup = gproc:lookup_local_name({socketio_client_sup, Port}),
     supervisor:start_child(Sup, [Sup0, Module, SessionId, ServerModule, ConnectionReference]).
 
 

diff --git a/src/socketio_client_sup.erl b/src/socketio_client_sup.erl
@@ -16,14 +16,14 @@
 %% ===================================================================
 
 start_link(Port) ->
-    Name = list_to_atom(atom_to_list(?MODULE)++"_"++integer_to_list(Port)),
-    supervisor:start_link({local, Name}, ?MODULE, []).
+    supervisor:start_link(?MODULE, [Port]).
 
 %% ===================================================================
 %% Supervisor callbacks
 %% ===================================================================
 
-init([]) ->
+init([Port]) ->
+    gproc:add_local_name({?MODULE, Port}),
     {ok, { {simple_one_for_one, 5, 10}, [
                                   {socketio_client, {socketio_client, start_link, []}, 
                                    transient, 5000, worker, [socketio_client]}

diff --git a/src/socketio_listener_sup.erl b/src/socketio_listener_sup.erl
@@ -17,38 +17,47 @@
 
 start_link(Options) ->
     %% This is a terrible, sad hack to avoid duplicates
-    Port = proplists:get_value(http_port, Options),
-    Name = list_to_atom(atom_to_list(?MODULE)++"_"++integer_to_list(Port)),
-    supervisor:start_link({local, Name}, ?MODULE, [Options]).
+    case supervisor:start_link(?MODULE, [Options]) of
+        {ok, Pid} ->
+            {ok, Pid};
+        ignore ->
+            {ok, gproc:lookup_local_name({?MODULE,proplists:get_value(http_port, Options, 80)})}
+    end.
 
 %% ===================================================================
 %% Supervisor callbacks
 %% ===================================================================
 
 init([Options]) ->
-    ServerModule = proplists:get_value(server, Options, socketio_http_misultin),
     HttpPort = proplists:get_value(http_port, Options, 80),
-    DefaultHttpHandler = proplists:get_value(default_http_handler, Options),
-    Resource = lists:reverse(string:tokens(proplists:get_value(resource, Options, "socket.io"),"/")),
-    SSL = proplists:get_value(ssl, Options),
-    Origins = proplists:get_value(origins,Options,[{"*", "*"}]),
-    {ok, { {one_for_one, 5, 10}, [
-                                  {socketio_listener_event_manager, {gen_event, start_link, []},
-                                   permanent, 5000, worker, [gen_event]},
-
-                                  {socketio_listener, {socketio_listener, start_link, [self(), Origins]},
-                                   permanent, 5000, worker, [socketio_listener]},
-
-                                  {socketio_http, {socketio_http, start_link, [ServerModule,
-                                                                               HttpPort,
-                                                                               Resource,
-									       SSL,
-                                                                               DefaultHttpHandler,
-                                                                               self()]}, 
-                                   permanent, 5000, worker, [socketio_http]},
-
-                                  {list_to_atom("socketio_client_sup_" ++ integer_to_list(HttpPort)), {socketio_client_sup, start_link, [HttpPort]}, 
-                                   permanent, infinity, supervisor, [socketio_client_sup]}
-
-                                 ]} }.
+    try gproc:add_local_name({?MODULE, HttpPort}) of
+        _ ->
+            ServerModule = proplists:get_value(server, Options, socketio_http_misultin),
+            DefaultHttpHandler = proplists:get_value(default_http_handler, Options),
+            Resource = lists:reverse(string:tokens(proplists:get_value(resource, Options, "socket.io"),"/")),
+            SSL = proplists:get_value(ssl, Options),
+            Origins = proplists:get_value(origins,Options,[{"*", "*"}]),
+            {ok, { {one_for_one, 5, 10}, [
+                        {socketio_listener_event_manager, {gen_event, start_link, []},
+                         permanent, 5000, worker, [gen_event]},
+
+                        {socketio_listener, {socketio_listener, start_link, [self(), Origins]},
+                         permanent, 5000, worker, [socketio_listener]},
+
+                        {socketio_http, {socketio_http, start_link, [ServerModule,
+                                                                     HttpPort,
+                                                                     Resource,
+                                                                     SSL,
+                                                                     DefaultHttpHandler,
+                                                                     self()]}, 
+                         permanent, 5000, worker, [socketio_http]},
+
+                        {{socketio_client_sup,HttpPort}, {socketio_client_sup, start_link, [HttpPort]}, 
+                         permanent, infinity, supervisor, [socketio_client_sup]}
+
+                        ]} }
+    catch
+        error:badarg ->
+            ignore
+    end.