这是indexloc提供的服务，不要输入任何密码
Skip to content

give precedence to retry-after header over retry conf #954

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 1 commit into from
Oct 31, 2018
Merged

give precedence to retry-after header over retry conf #954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions server/src-lib/Hasura/Events/Lib.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,13 @@ processEvent logenv pool e = do
retryConfM = etiRetryConf <$> eti
retryConf = fromMaybe (RetryConf 0 10) retryConfM
tries = eTries e
retryHeaderSeconds = parseRetryHeader mretryHeader
mretryHeaderSeconds = parseRetryHeader mretryHeader
triesExhausted = tries >= rcNumRetries retryConf
noRetryHeader = isNothing retryHeaderSeconds
noRetryHeader = isNothing mretryHeaderSeconds
if triesExhausted && noRetryHeader -- current_try = tries + 1 , allowed_total_tries = rcNumRetries retryConf + 1
then liftIO $ runExceptT $ runErrorAndUnlockQ pool e
else do
let delay = chooseDelay triesExhausted (rcIntervalSec retryConf) retryHeaderSeconds
let delay = fromMaybe (rcIntervalSec retryConf) mretryHeaderSeconds -- give precedence to Retry-After header
liftIO $ runExceptT $ runRetryAfterAndUnlockQ pool e delay

getRetryAfterHeaderFromError (HStatus resp) = getRetryAfterHeaderFromResp resp
Expand All @@ -262,12 +262,6 @@ processEvent logenv pool e = do
Nothing -> Nothing
Just sec -> if sec > 0 then Just sec else Nothing

-- we need to choose delay between the retry conf and the retry-after header
chooseDelay _ retryConfSec Nothing = retryConfSec
chooseDelay triesExhausted retryConfSec (Just retryHeaderSec) = if triesExhausted
then retryHeaderSec
else min retryHeaderSec retryConfSec

tryWebhook
:: ( MonadReader r m
, MonadIO m
Expand Down