Skip to content
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

Print errors from action handlers in stdout instead of ignoring them #197

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Print errors from action handlers in stdout instead of ignoring them #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
857378a
Print errors from action handlers in stdout instead of ignoring them
swamp-agr Nov 7, 2024
4018bfd
Add extra haddock for `liftClientM`
swamp-agr Nov 7, 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
9 changes: 7 additions & 2 deletions telegram-bot-simple/src/Telegram/Bot/Simple/BotApp/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ processAction BotApp{..} botEnv@BotEnv{..} update action = do
(newModel, effects) -> do
writeTVar botModelVar newModel
return effects
mapM_ ((liftIO . issueAction botEnv update) <=< runBotM (BotContext botUser update)) effects
let runBotAndIssueAction
= (liftIO . issueAction botEnv update) <=< runBotM (BotContext botUser update)
mapM_ runBotAndIssueAction effects

-- | A job to wait for the next action and process it.
processActionJob :: BotApp model action -> BotEnv model action -> ClientM ()
Expand All @@ -122,7 +124,10 @@ processActionsIndefinitely
:: BotApp model action -> BotEnv model action -> IO ThreadId
processActionsIndefinitely botApp botEnv = do
a <- asyncLink $ forever $ do
runClientM (processActionJob botApp botEnv) (botClientEnv botEnv)
res <- runClientM (processActionJob botApp botEnv) (botClientEnv botEnv)
case res of
Left err -> print err
Right _ -> return ()
return (asyncThreadId a)

-- | Start 'Telegram.Update' polling for a bot.
Expand Down
3 changes: 3 additions & 0 deletions telegram-bot-simple/src/Telegram/Bot/Simple/Eff.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ data BotContext = BotContext
, botContextUpdate :: Maybe Telegram.Update
}

-- | To retain control over errors coming from Telegram API in `BotM`,
-- consider using `liftIO . flip runClientM clientEnv` instead.
-- Issues generated by servant-client will be logged, response failure errors will be ignored.
liftClientM :: ClientM a -> BotM a
liftClientM = BotM . lift

Expand Down
Loading