connection-handler: rethrow exceptions using ExceptionInHandler

This allows the consensus to use it's error policy to wrap around the `Ouroboros.Network.Consensus.Node.runWith` to catch all initialisation errors without interfering with all the exceptions rethrown by the network layer.
IntersectMBO · Sep 22, 2022 · 59a82be · 59a82be
1 parent 5d9a5bd
commit 59a82be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionHandler.hs b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionHandler.hs
@@ -229,7 +229,7 @@ makeConnectionHandler muxTracer singMuxMode
               throwTo mainThreadId (ExceptionInHandler remoteAddress err)
               throwIO err
             ShutdownPeer ->
-              throwIO err
+              throwIO (ExceptionInHandler remoteAddress err)
 
     outboundConnectionHandler
       :: HasInitiator muxMode ~ True

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Types.hs b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Types.hs
@@ -372,8 +372,8 @@ data Inactive =
   deriving (Eq, Show)
 
 
--- | Exception which where caught in the connection thread and were re-thrown
--- in the main thread by the 'rethrowPolicy'.
+-- | Exception which where caught in the connection thread and were re-thrown in
+-- the main thread by the 'rethrowPolicy'.
 --
 data ExceptionInHandler peerAddr where
     ExceptionInHandler :: !peerAddr