Skip to content

apm-2006: set timeout back to 60sec #60

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
matt-mercer merged 1 commit into from
Apr 27, 2021
Merged

apm-2006: set timeout back to 60sec #60

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions docker/sync-wrap/src/handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ async function proxy(req, res, next) {
await sleep(Math.min(options.sleep, remaining_timeout));

remaining_timeout = options.respond_before.getTime() - (new Date()).getTime();
options.timeout = Math.max(remaining_timeout, 5000);
options.timeout = Math.max(remaining_timeout, 50000);


options.sleep = Math.min(2*options.sleep, 1000*locals.max_sleep);
Expand Down Expand Up @@ -493,7 +493,7 @@ async function proxy(req, res, next) {
}
let prev_cookies = options.received_cookies.values();
let headers = prev_cookies.length === 0 ? undefined : ["set-cookie", prev_cookies];
await send_response(502, {headers: headers, error: fin.error});
await send_response(502, {headers: headers, error: fin.error || fin});
});
}

Expand Down
4 changes: 1 addition & 3 deletions e2e/tests/api_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,12 @@ async def is_deployed(resp: ClientResponse):

return backend.get("commitId") == api_test_config.commit_id

deploy_timeout = 120 if api_test_config.api_environment.endswith("sandbox") else 30

await poll_until(
make_request=lambda: api_client.get(
"_status", headers={"apikey": env.status_endpoint_api_key()}
),
until=is_deployed,
timeout=deploy_timeout,
timeout=120,
)


Expand Down