Don't let peer_up/peer_down take down the service process

This would previously have resulted in all of a service's connections
going down, especially bad for a server.

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index c7b216c6f7..77f7c6dd8e 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -945,12 +945,15 @@ ilp({Id, Alias}, {TC, SA}, LDict) ->
     init_conn(Id, Alias, TC, SA),
     ?Dict:append(Alias, TC, LDict).
 
-init_conn(Id, Alias, TC, {SvcName, Apps}) ->
+init_conn(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) ->
     #diameter_app{module = ModX,
                   id = Id}  %% assert
         = find_app(Alias, Apps),
 
-    peer_cb({ModX, peer_up, [SvcName, TC]}, Alias).
+    peer_cb({ModX, peer_up, [SvcName, TC]}, Alias)
+        orelse exit(TPid, kill).  %% fake transport failure
+
+%% find_app/2
 
 find_app(Alias, Apps) ->
     case lists:keyfind(Alias, #diameter_app.alias, Apps) of
@@ -960,17 +963,17 @@ find_app(Alias, Apps) ->
             A
     end.
 
-%% A failing peer callback brings down the service. In the case of
-%% peer_up we could just kill the transport and emit an error but for
-%% peer_down we have no way to cleanup any state change that peer_up
-%% may have introduced.
+%% Don't bring down the service (and all associated connections)
+%% regardless of what happens.
 peer_cb(MFA, Alias) ->
     try state_cb(MFA, Alias) of
         ModS ->
-            mod_state(Alias, ModS)
+            mod_state(Alias, ModS),
+            true
     catch
-        E: Reason ->
-            ?ERROR({E, Reason, MFA, ?STACK})
+        E:R ->
+            diameter_lib:error_report({failure, {E, R, Alias, ?STACK}}, MFA),
+            false
     end.
 
 %%% ---------------------------------------------------------------------------