noss / iserve Goto Github PK

---
 src/iserve_master.erl |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/iserve_master.erl b/src/iserve_master.erl
index 02872fc..879c6e9 100644
--- a/src/iserve_master.erl
+++ b/src/iserve_master.erl
@@ -51,9 +51,8 @@ code_change(_OldVsn, State, _Extra) ->
 %%% Internal functions

 call_add_server({_Starter, _Port, _Callback, _Context}=Conf, S) ->
-    {ok, Pid} = iserve_server_sup:add_server(S#state.supervisor, Conf),
+    Reply = iserve_server_sup:add_server(S#state.supervisor, Conf),
     %% TODO: Monitor the little bugger
-    Reply = {ok, Pid},
     {reply, Reply, S}.

 call_del_server(Pid, S) ->
-- 
1.6.3.3

@@ -91,12 +91,12 @@ handle_info({'EXIT', Pid, normal}, #state{acceptor=Pid} = State) ->
 %% The current acceptor has died, wait a little and try again
 handle_info({'EXIT', Pid, _Abnormal}, #state{acceptor=Pid} = State) ->
     timer:sleep(2000),
-    iserve_socket:start_link(State#state.cb_mod, 
+    New_pid = iserve_socket:start_link(State#state.cb_mod, 
                              State#state.cb_data, 
                              self(), 
                              State#state.listen_socket, 
                              State#state.port),
-    {noreply, State};
+    {noreply, State#state{acceptor=New_pid}};

 handle_info(_Info, State) ->
     {noreply, State}.