Allow the supervisor tree to restart a failed release

Signed-off-by: Gregory Haskins <ghaskins@novell.com>
ghaskins · Apr 19, 2011 · 6f2ab65 · 6f2ab65
1 parent 899b265
commit 6f2ab65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/agent/app/src/main/erlang/edist_agent_sup.erl b/agent/app/src/main/erlang/edist_agent_sup.erl
@@ -26,7 +26,7 @@ delete_child(Id) ->
     ok = supervisor:delete_child(?MODULE, Id).
 
 init([Path]) ->
-    {ok,{{one_for_all,0,1},
+    {ok,{{one_for_one,1,60},
 	 [
 	  {'edist-agent',
 	   {edist_agent,start_link,[]},

diff --git a/agent/app/src/main/erlang/release_fsm.erl b/agent/app/src/main/erlang/release_fsm.erl
@@ -49,7 +49,7 @@ connecting({controller, connected, Session}, State) ->
 
 binding({release_stopped, _Data}, State) ->
     gen_fsm:cancel_timer(State#state.tmoref),
-    {stop, normal, State};
+    {stop, "Subordinate death", State};
 binding({timeout, _, bind}, State) ->
     case bind(State) of
 	true ->
@@ -69,7 +69,7 @@ binding({controller, disconnected}, State) ->
 
 disconnected_binding({release_stopped, _Data}, State) ->
     gen_fsm:cancel_timer(State#state.tmoref),
-    {stop, normal, State};
+    {stop, "Subordinate death", State};
 disconnected_binding({timeout, _, bind}, State) ->
     case bind(State) of
 	true ->
@@ -93,7 +93,7 @@ disconnected_binding({controller, connected, Session}, State) ->
 
 upgrading_binding({release_stopped, _Data}, State) ->
     gen_fsm:cancel_timer(State#state.tmoref),
-    {stop, normal, State};
+    {stop, "Subordinate death", State};
 upgrading_binding({timeout, _, bind}, State) ->
     case bind(State) of
 	true ->
@@ -106,7 +106,7 @@ upgrading_binding({controller, disconnected}, State) ->
      State#state{session=undefined, subid=undefined}}.
 
 running({release_stopped, _Data}, State) ->
-    {stop, normal, State};
+    {stop, "Subordinate death", State};
 running({hotupdate, Vsn}, State) ->
     if
 	Vsn =/= State#state.vsn ->
@@ -118,7 +118,7 @@ running({controller, disconnected}, State) ->
     {next_state, reconnecting, State#state{session=undefined, subid=undefined}}.
 
 reconnecting({release_stopped, _Data}, State) ->
-    {stop, normal, State};
+    {stop, "Subordinate death", State};
 reconnecting({controller, connected, Session}, State) ->
     {ok, RelProps, SubId} =
 	controller_api:subscribe_release(Session, State#state.rel),