From d8ca9270b3772867d0287b3cf9c7b5f53bbccf1b Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <paolo@capriotti.io>
Date: Wed, 11 May 2022 14:31:31 +0200
Subject: [PATCH 1/3] Log IO exceptions in brig

---
 services/brig/src/Brig/API/Handler.hs | 30 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/services/brig/src/Brig/API/Handler.hs b/services/brig/src/Brig/API/Handler.hs
index 2f4d10831f..4d5e42b5d1 100644
--- a/services/brig/src/Brig/API/Handler.hs
+++ b/services/brig/src/Brig/API/Handler.hs
@@ -62,6 +62,7 @@ import Network.Wai.Utilities.Request (JsonRequest, lookupRequestId, parseBody)
 import Network.Wai.Utilities.Response (addHeader, json, setStatus)
 import qualified Network.Wai.Utilities.Server as Server
 import qualified Servant
+import qualified System.Logger as Log
 import System.Logger.Class (Logger)
 import Wire.API.Error
 import Wire.API.Error.Brig
@@ -79,17 +80,21 @@ runHandler ::
   IO ResponseReceived
 runHandler e r h k = do
   let e' = set requestId (maybe def RequestId (lookupRequestId r)) e
-  a <- runAppT e' (runExceptT h) `catches` brigErrorHandlers
+  a <-
+    runAppT e' (runExceptT h)
+      `catches` brigErrorHandlers (view applog e) (unRequestId (view requestId e))
   either (onError (view applog e') r k) return a
 
 toServantHandler :: Env -> (Handler BrigCanonicalEffects) a -> Servant.Handler a
 toServantHandler env action = do
-  a <- liftIO $ runAppT env (runExceptT action) `catches` brigErrorHandlers
+  let logger = view applog env
+      reqId = unRequestId $ view requestId env
+  a <-
+    liftIO $
+      runAppT env (runExceptT action)
+        `catches` brigErrorHandlers logger reqId
   case a of
-    Left werr ->
-      let reqId = unRequestId $ view requestId env
-          logger = view applog env
-       in handleWaiErrors logger reqId werr
+    Left werr -> handleWaiErrors logger reqId werr
     Right x -> pure x
   where
     mkCode = statusCode . WaiError.code
@@ -112,8 +117,8 @@ newtype UserNotAllowedToJoinTeam = UserNotAllowedToJoinTeam WaiError.Error
 
 instance Exception UserNotAllowedToJoinTeam
 
-brigErrorHandlers :: [Catch.Handler IO (Either Error a)]
-brigErrorHandlers =
+brigErrorHandlers :: Logger -> ByteString -> [Catch.Handler IO (Either Error a)]
+brigErrorHandlers logger reqId =
   [ Catch.Handler $ \(ex :: PhoneException) ->
       pure (Left (phoneError ex)),
     Catch.Handler $ \(ex :: ZV.Failure) ->
@@ -122,8 +127,13 @@ brigErrorHandlers =
       case ex of
         AWS.SESInvalidDomain -> pure (Left (StdError (errorToWai @'InvalidEmail)))
         _ -> throwM ex,
-    Catch.Handler $ \(UserNotAllowedToJoinTeam e) ->
-      pure (Left $ StdError e)
+    Catch.Handler $ \(UserNotAllowedToJoinTeam e) -> pure (Left $ StdError e),
+    Catch.Handler $ \(e :: SomeException) -> do
+      Log.err logger $
+        Log.msg ("IO Exception occurred" :: ByteString)
+          . Log.field "message" (displayException e)
+          . Log.field "request" reqId
+      throwIO e
   ]
 
 onError :: Logger -> Request -> Continue IO -> Error -> IO ResponseReceived

From 12739c893730344eb9d7f006be70ade09cee4b91 Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <paolo@capriotti.io>
Date: Wed, 11 May 2022 15:24:47 +0200
Subject: [PATCH 2/3] Log IO exceptions in Galley

---
 services/galley/src/Galley/App.hs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/services/galley/src/Galley/App.hs b/services/galley/src/Galley/App.hs
index 189a569564..72a221a3e7 100644
--- a/services/galley/src/Galley/App.hs
+++ b/services/galley/src/Galley/App.hs
@@ -49,7 +49,7 @@ import Bilge hiding (Request, header, options, statusCode, statusMessage)
 import Cassandra hiding (Set)
 import qualified Cassandra as C
 import qualified Cassandra.Settings as C
-import Control.Error
+import Control.Error hiding (err)
 import Control.Lens hiding ((.=))
 import Data.ByteString.Conversion (toByteString')
 import Data.Default (def)
@@ -96,13 +96,14 @@ import Polysemy.Internal (Append)
 import qualified Polysemy.TinyLog as P
 import qualified Servant
 import Ssl.Util
+import qualified System.Logger as Log
 import System.Logger.Class
 import qualified System.Logger.Extended as Logger
 import qualified UnliftIO.Exception as UnliftIO
 import Util.Options
 import Wire.API.Error
 import Wire.API.Federation.Error
-import qualified Wire.Sem.Logger as Log
+import qualified Wire.Sem.Logger
 
 -- Effects needed by the interpretation of other effects
 type GalleyEffects0 =
@@ -196,10 +197,17 @@ interpretTinyLog ::
   Sem (P.TinyLog ': r) a ->
   Sem r a
 interpretTinyLog e = interpret $ \case
-  P.Log l m -> Logger.log (e ^. applog) (Log.toLevel l) (reqIdMsg (e ^. reqId) . m)
+  P.Log l m -> Logger.log (e ^. applog) (Wire.Sem.Logger.toLevel l) (reqIdMsg (e ^. reqId) . m)
 
 toServantHandler :: Env -> Sem GalleyEffects a -> Servant.Handler a
-toServantHandler e = liftIO . evalGalley e
+toServantHandler env action =
+  liftIO $
+    evalGalley env action `UnliftIO.catch` \(e :: SomeException) -> do
+      Log.err (env ^. applog) $
+        Log.msg ("IO Exception occurred" :: ByteString)
+          . Log.field "message" (displayException e)
+          . Log.field "request" (unRequestId (env ^. reqId))
+      UnliftIO.throwIO e
 
 interpretErrorToException ::
   (Exception exc, Member (Embed IO) r) =>

From 3c237c6a270487886f4146240d24263e5d8d203a Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <paolo@capriotti.io>
Date: Wed, 11 May 2022 15:25:30 +0200
Subject: [PATCH 3/3] Add CHANGELOG entry

---
 changelog.d/5-internal/log-exceptions | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5-internal/log-exceptions

diff --git a/changelog.d/5-internal/log-exceptions b/changelog.d/5-internal/log-exceptions
new file mode 100644
index 0000000000..555c880c27
--- /dev/null
+++ b/changelog.d/5-internal/log-exceptions
@@ -0,0 +1 @@
+Log IO exceptions in Galley and Brig