forge/Vervis
1
0
Fork 0
Code Pull requests Activity

Log errors for linked delivery from outbox, both in handler and periodic

Browse source
This commit is contained in:
fr33domlover 2019-05-09 23:09:34 +00:00
parent 635952a797
commit e29053145f
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Vervis/Federation.hs
View file

@ -1561,12 +1561,18 @@ handleOutboxNote host (Note mluNote luAttrib aud muParent muContext mpublished c
deliverFetched deliver now ((_, h), recips@(r :| rs)) = do deliverFetched deliver now ((_, h), recips@(r :| rs)) = do
let (raid, luActor, luInbox, dlid) = r let (raid, luActor, luInbox, dlid) = r
(_, e) <- deliver luActor h luInbox (_, e) <- deliver luActor h luInbox
let e' = case e of e' <- case e of
Left err -> Left err -> do
logError $ T.concat
[ "Outbox DL delivery #", T.pack $ show dlid
, " error for <", renderFedURI $ l2f h luActor
, ">: ", T.pack $ displayException err
]
return $
if isInstanceErrorP err if isInstanceErrorP err
then Nothing then Nothing
else Just False else Just False
Right _resp -> Just True Right _resp -> return $ Just True
case e' of case e' of
Nothing -> runDB $ do Nothing -> runDB $ do
let recips' = NE.toList recips let recips' = NE.toList recips
@ -1584,7 +1590,12 @@ handleOutboxNote host (Note mluNote luAttrib aud muParent muContext mpublished c
(_, e) <- deliver luActor h luInbox (_, e) <- deliver luActor h luInbox
runDB $ runDB $
case e of case e of
Left _err -> do Left err -> do
logError $ T.concat
[ "Outbox DL delivery #", T.pack $ show dlid
, " error for <", renderFedURI $ l2f h luActor
, ">: ", T.pack $ displayException err
]
updateWhere [RemoteActorId ==. raid, RemoteActorErrorSince ==. Nothing] [RemoteActorErrorSince =. Just now] updateWhere [RemoteActorId ==. raid, RemoteActorErrorSince ==. Nothing] [RemoteActorErrorSince =. Just now]
update dlid [DeliveryRunning =. False] update dlid [DeliveryRunning =. False]
Right _resp -> delete dlid Right _resp -> delete dlid
@ -1636,6 +1647,7 @@ handleOutboxNote host (Note mluNote luAttrib aud muParent muContext mpublished c
retryOutboxDelivery :: Worker () retryOutboxDelivery :: Worker ()
retryOutboxDelivery = do retryOutboxDelivery = do
logInfo "Periodic delivery starting"
now <- liftIO $ getCurrentTime now <- liftIO $ getCurrentTime
(udls, dls, fws) <- runSiteDB $ do (udls, dls, fws) <- runSiteDB $ do
-- Get all unlinked deliveries which aren't running already in outbox -- Get all unlinked deliveries which aren't running already in outbox
@ -1729,6 +1741,7 @@ retryOutboxDelivery = do
unless (and resultsFW) $ logError "Periodic delivery FW error" unless (and resultsFW) $ logError "Periodic delivery FW error"
resultsUDL <- sequence waitsUDL resultsUDL <- sequence waitsUDL
unless (and resultsUDL) $ logError "Periodic delivery UDL error" unless (and resultsUDL) $ logError "Periodic delivery UDL error"
logInfo "Periodic delivery done"
where where
adaptUnlinked adaptUnlinked
(E.Value iid, E.Value h, E.Value uraid, E.Value luRecip, E.Value since, E.Value udlid, E.Value obid, E.Value fwd, E.Value act, E.Value mraid) = (E.Value iid, E.Value h, E.Value uraid, E.Value luRecip, E.Value since, E.Value udlid, E.Value obid, E.Value fwd, E.Value act, E.Value mraid) =
@ -1801,7 +1814,13 @@ retryOutboxDelivery = do
let fwd' = if fwd then Just ident else Nothing let fwd' = if fwd then Just ident else Nothing
e <- deliver doc fwd' h inbox e <- deliver doc fwd' h inbox
case e of case e of
Left _err -> return False Left err -> do
logError $ T.concat
[ "Periodic DL delivery #", T.pack $ show dlid
, " error for <", renderFedURI $ l2f h ident, ">: "
, T.pack $ displayException err
]
return False
Right _resp -> do Right _resp -> do
runSiteDB $ delete dlid runSiteDB $ delete dlid
return True return True