File 0154-ssl-Adjust-EXIT-handling-for-distribution-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0154-ssl-Adjust-EXIT-handling-for-distribution-case.patch of Package erlang (Revision b47b3d0a87f21630280b8ed6f4d34508)

Currently displaying revision b47b3d0a87f21630280b8ed6f4d34508 , Show latest

From 42477bb575a6a997c92c53feea62d33c49548693 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 3 Jan 2022 14:21:58 +0100
Subject: [PATCH] ssl: Adjust EXIT handling for distribution case

If Erlang distribution is run over TLS we might get a exit message
from a distribution process as well as from our supervisor, if so we
should use the other distribution processes EXIT Reason.
---
 lib/ssl/src/tls_sender.erl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index 34ec00a96f..2fd05104b7 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -421,7 +421,15 @@ handle_common({call, From}, {set_opts, Opts},
      [{reply, From, ok}]};
 handle_common(info, {'EXIT', _Sup, shutdown},
               #data{static = #static{dist_handle = Handle}} = StateData) when Handle =/= undefined ->
+    %% When the connection is on its way down operations
+    %% begin to fail. We wait for 5 seconds to receive
+    %% possible exit signals for one of our links to the other
+    %% involved distribution parties, in which case we want to use
+    %% their exit reason for the connection teardown.
     {next_state, death_row, StateData, [{state_timeout, 5000, shutdown}]};
+handle_common(info, {'EXIT', _Dist, Reason},
+              #data{static = #static{dist_handle = Handle}} = StateData) when Handle =/= undefined ->
+    {stop, {shutdown, Reason}, StateData};
 handle_common(info, {'EXIT', _Sup, shutdown}, StateData) ->
     {stop, shutdown, StateData};
 handle_common(info, Msg, #data{static = #static{log_level = Level}}) ->
-- 
2.31.1

Places

File 0154-ssl-Adjust-EXIT-handling-for-distribution-case.patch of Package erlang (Revision b47b3d0a87f21630280b8ed6f4d34508)

Places