Skip to content

Make sure to actually wrap the action in 'wrapMonadClientSem' #1786

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
merged 5 commits into from
Sep 20, 2021
Merged

Make sure to actually wrap the action in 'wrapMonadClientSem' #1786

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdf4c61
Make sure to actually wrap the action in 'wrapMonadClientSem'
isovector Sep 17, 2021
b239949
Implement wrapMonadClient in terms of wrapMonadClientSem
isovector Sep 17, 2021
4173291
Update changelog
isovector Sep 17, 2021
75788c4
Merge branch 'develop' into wrap-monad-client-sem
isovector Sep 17, 2021
757889a
ormolu
fisx Sep 20, 2021
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
11 changes: 7 additions & 4 deletions services/spar/src/Spar/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,17 @@ instance Member (Final IO) r => Catch.MonadCatch (Sem r) where
-- | Call a cassandra command in the 'Spar' monad. Catch all exceptions and re-throw them as 500 in
-- Handler.
wrapMonadClient :: Cas.Client a -> Spar r a
wrapMonadClient action = do
wrapMonadClient action =
Spar $ do
ctx <- asks sparCtxCas
lift (lift $ embedFinal @IO $ runClient ctx action)
`Catch.catch` (throwSpar . SparCassandraError . cs . show @SomeException)
fromSpar $ wrapMonadClientSem $ embedFinal @IO $ runClient ctx action

-- | Call a 'Sem' command in the 'Spar' monad. Catch all (IO) exceptions and
-- re-throw them as 500 in Handler.
wrapMonadClientSem :: Sem r a -> Spar r a
wrapMonadClientSem action = liftSem $ action
wrapMonadClientSem action =
Spar $ (lift $ lift action) `Catch.catch`
(throwSpar . SparCassandraError . cs . show @SomeException)

insertUser :: Member SAMLUser r => SAML.UserRef -> UserId -> Spar r ()
insertUser uref uid = wrapMonadClientSem $ SAMLUser.insert uref uid
Expand Down