Hide Warp exceptions better in logs

Author: tchoutri

flora.cabal

@@ -69,6 +69,7 @@ common common-rts-options
     -rtsopts
     -threaded
     "-with-rtsopts=-N -Iw1 --disable-delayed-os-memory-return -T"
+
   -- Use TCMalloc instead of glibc's malloc.
   if !(os(osx) && arch(aarch64))
     pkgconfig-depends: libtcmalloc

src/web/FloraWeb/Common/Tracing.hs

@@ -30,38 +30,38 @@ handleExceptions
 handleExceptions logger environment mltp mRequest e@(E.SomeException exception) = do
   Log.runLogT "flora-production" logger LogAttention $ do
     let context = E.displayExceptionContext $ E.someExceptionContext e
-    Log.logAttention "Unhandled exception" $
-      Aeson.object
-        [ "exception" .= display (show exception)
-        , "backtraces" .= context
-        ]
-    case mltp.sentryDSN of
-      Nothing -> throw exception
-      Just sentryDSN ->
-        if shouldDisplayException e && isJust mRequest
-          then do
-            sentryService <-
-              liftIO $
-                initRaven
-                  sentryDSN
-                  (\defaultRecord -> defaultRecord{srEnvironment = Just $ show environment})
-                  sendRecord
-                  silentFallback
-            liftIO $
-              register
-                sentryService
-                "flora-server"
-                Error
-                (formatMessage mRequest e)
-                (recordUpdate mRequest e)
-            liftIO $ defaultOnException mRequest e
-          else liftIO $ defaultOnException mRequest e
+    when (shouldDisplayException e) $
+      Log.logAttention "Unhandled exception" $
+        Aeson.object
+          [ "exception" .= display (show exception)
+          , "backtraces" .= context
+          ]
+          case mltp.sentryDSN of
+            Nothing -> throw exception
+            Just sentryDSN ->
+              if isJust mRequest
+                then do
+                  sentryService <-
+                    liftIO $
+                      initRaven
+                        sentryDSN
+                        (\defaultRecord -> defaultRecord{srEnvironment = Just $ show environment})
+                        sendRecord
+                        silentFallback
+                  liftIO $
+                    register
+                      sentryService
+                      "flora-server"
+                      Error
+                      (formatMessage mRequest e)
+                      (recordUpdate mRequest e)
+                  liftIO $ defaultOnException mRequest e
+                else liftIO $ defaultOnException mRequest e
 
 shouldDisplayException :: SomeException -> Bool
 shouldDisplayException exception
   | Just ThreadKilled <- fromException exception = False
   | Just TimeoutThread <- fromException exception = False
-  | Just ConnectionClosedByPeer <- fromException exception = False
   | Just (_ :: InvalidRequest) <- fromException exception = False
   | Just (ioeGetErrorType -> et) <- fromException exception
   , et == ResourceVanished || et == InvalidArgument =