Skip to content

Log uncaught IO exceptions in cargohold #4352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcapriotti merged 2 commits into from
Nov 29, 2024
Merged

Log uncaught IO exceptions in cargohold #4352

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f510497
Log uncaught IO exceptions in cargohold
pcapriotti Nov 29, 2024
70071cb
Add CHANGELOG entry
pcapriotti Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions services/cargohold/src/CargoHold/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import Bilge.RPC (HasRequestId (..))
import qualified CargoHold.AWS as AWS
import CargoHold.Options (AWSOpts, Opts, S3Compatibility (..), brig)
import qualified CargoHold.Options as Opt
import Control.Error (ExceptT, exceptT)
import Control.Exception (throw)
import Control.Error (ExceptT, runExceptT)
import Control.Exception (catch, throwIO)
import Control.Lens (lensField, lensRules, makeLensesWith, non, (.~), (?~), (^.))
import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow)
import Data.Id
Expand Down Expand Up @@ -241,4 +241,12 @@ executeBrigInteral action = do
type Handler = ExceptT Error App

runHandler :: Env -> Handler a -> IO a
runHandler e h = runAppT e (exceptT throw pure h)
runHandler env h =
catch
(runAppT env (runExceptT h) >>= either throwIO pure)
$ \(e :: SomeException) -> do
Log.err env.appLogger $
Log.msg ("IO Exception occurred" :: ByteString)
. Log.field "message" (displayException e)
. Log.field "request" (unRequestId env.requestId)
throwIO e