From 90c4963125a0ddf9cdea92285d22b33a3a26ff56 Mon Sep 17 00:00:00 2001 From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com> Date: Tue, 8 Apr 2025 14:27:33 +0100 Subject: [PATCH] Make Proxy Timeouts Configurable via PROXY_TIMEOUT_SECONDS (#15908) --- hosting/proxy/Dockerfile | 1 + hosting/proxy/nginx.prod.conf | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile index 9ec458a219..085d8dbc81 100644 --- a/hosting/proxy/Dockerfile +++ b/hosting/proxy/Dockerfile @@ -17,6 +17,7 @@ COPY error.html /usr/share/nginx/html/error.html # Default environment ENV PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10 ENV PROXY_RATE_LIMIT_API_PER_SECOND=20 +ENV PROXY_TIMEOUT_SECONDS=120 # Use docker-compose values as defaults for backwards compatibility ENV APPS_UPSTREAM_URL=http://app-service:4002 ENV WORKER_UPSTREAM_URL=http://worker-service:4003 diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf index c5d378afd8..038cb49e4f 100644 --- a/hosting/proxy/nginx.prod.conf +++ b/hosting/proxy/nginx.prod.conf @@ -144,9 +144,9 @@ http { limit_req zone=ratelimit burst=20 nodelay; # 120s timeout on API requests - proxy_read_timeout 120s; - proxy_connect_timeout 120s; - proxy_send_timeout 120s; + proxy_read_timeout ${PROXY_TIMEOUT_SECONDS}s; + proxy_connect_timeout ${PROXY_TIMEOUT_SECONDS}s; + proxy_send_timeout ${PROXY_TIMEOUT_SECONDS}s; proxy_http_version 1.1; proxy_set_header Connection $connection_upgrade; @@ -164,9 +164,9 @@ http { # Rest of configuration copied from /api/ location above # 120s timeout on API requests - proxy_read_timeout 120s; - proxy_connect_timeout 120s; - proxy_send_timeout 120s; + proxy_read_timeout ${PROXY_TIMEOUT_SECONDS}s; + proxy_connect_timeout ${PROXY_TIMEOUT_SECONDS}s; + proxy_send_timeout ${PROXY_TIMEOUT_SECONDS}s; proxy_http_version 1.1; proxy_set_header Connection $connection_upgrade;