digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Handle ExitCodeException in wrapErr (#2415)

Browse Source 
This is thrown by typed-process when the child process exits with a
non-zero exitcode.

fixes #2414
This commit is contained in:
Moritz Kiefer 2019-08-06 10:49:25 +02:00 committed by mergify[bot]
parent e0ced61770
commit 656d8f4a19
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daml-assistant/BUILD.bazel
View File

@ -63,6 +63,7 @@ da_haskell_library(
"text",
"time",
"tls",
"typed-process",
"unix-compat",
"utf8-string",
"yaml",

2
daml-assistant/src/DA/Daml/Assistant/Util.hs
View File

@ -14,6 +14,7 @@ import Control.Exception.Safe
import Control.Applicative
import Control.Monad.Extra
import Data.Either.Extra
import System.Process.Typed (ExitCodeException(..))
-- | Throw an assistant error.
throwErr :: Text -> IO a
@ -24,6 +25,7 @@ throwErr msg = throwIO (assistantError msg)
wrapErr :: Text -> IO a -> IO a
wrapErr ctx m = m `catches`
[ Handler $ throwIO @IO @ExitCode
, Handler $ \(ExitCodeException{eceExitCode}) -> exitWith eceExitCode
, Handler $ throwIO . addErrorContext
, Handler $ throwIO . wrapException
]