Merge pull request #44 from basho/bugfix/sdc/gen-cast-to-fsm-event

Fix late registrations: riak_api_pb_server is no longer a gen_server
basho · Dec 18, 2013 · f181a7b · f181a7b
2 parents 7af7ded + 14940cb
commit f181a7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/riak_api_pb_server.erl b/src/riak_api_pb_server.erl
@@ -36,7 +36,7 @@
 -behaviour(gen_fsm).
 
 %% API
--export([start_link/0, set_socket/2]).
+-export([start_link/0, set_socket/2, service_registered/2]).
 
 %% States
 -export([wait_for_socket/2, wait_for_socket/3, wait_for_tls/2, wait_for_tls/3,
@@ -75,6 +75,11 @@ start_link() ->
 set_socket(Pid, Socket) ->
     gen_fsm:sync_send_event(Pid, {set_socket, Socket}, infinity).
 
+%% @doc Notifies the server process of a newly registered PB service.
+-spec service_registered(pid(), module()) -> ok.
+service_registered(Pid, Mod) ->
+    gen_fsm:send_all_state_event(Pid, {registered, Mod}).
+
 %% @doc The gen_server init/1 callback, initializes the
 %% riak_api_pb_server.
 -spec init(list()) -> {ok, #state{}}.

diff --git a/src/riak_api_pb_sup.erl b/src/riak_api_pb_sup.erl
@@ -40,7 +40,7 @@ service_registered(Mod) ->
         undefined ->
             ok;
         _ ->
-            [ gen_server:cast(Pid, {registered, Mod}) ||
+            [ riak_api_pb_server:service_registered(Pid, Mod) ||
                 {_,Pid,_,_} <- supervisor:which_children(?MODULE) ],
             ok
     end.