Skip to content

fix(integration): close transient probe connections and poll federatorExternal in checkServiceIsUp #5404

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

Open
blackheaven wants to merge 1 commit into from
+3 −2
Open

fix(integration): close transient probe connections and poll federatorExternal in checkServiceIsUp #5404

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
5 changes: 3 additions & 2 deletions integration/test/Testlib/ModService.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ checkFederationIngress origin target = do
Unversioned
("/rpc/" <> target <> "/brig/api-version")
<&> (addHeader "Wire-Origin-Domain" origin)
. (addHeader "Connection" "close")
. (addJSONObject [])
checkStatus <- appToIO $ do
submit "POST" req `bindResponse` \res -> do
Expand Down Expand Up @@ -515,13 +516,13 @@ waitUntilServiceIsUp mDebug domain srv = do
checkServiceIsUp :: String -> Service -> App Bool
checkServiceIsUp _ Nginz = pure True
checkServiceIsUp domain srv = do
req <- baseRequest domain srv Unversioned "/i/status"
req <- baseRequest domain srv Unversioned "/i/status" <&> addHeader "Connection" "close"
mExtReq <- case srv of
FederatorInternal -> do
sMap <- getServiceMap domain
let extHostPort = sMap.federatorExternal
extUrl = "http://" <> extHostPort.host <> ":" <> show extHostPort.port <> "/i/status"
Just <$> externalRequest extUrl
Just . addHeader "Connection" "close" <$> externalRequest extUrl
_ -> pure Nothing
checkStatus <- appToIO $ do
res <- submit "GET" req
Expand Down