Skip to content

Commit 19dbdea

Browse files
committed
🔧(tray) fix ineffective timeout settings for peertube runner requests
Previous increases to connection timeouts had no effect due to the requests being proxied through proxy_to_marsha_app, which overrides those settings. This fix moves the timeout configuration directly into the `proxy_to_marsha_app` location block to ensure they are properly applied. Note: This is a temporary, hacky workaround to avoid 504 Gateway Timeouts when the PeerTube runner POSTs to /success. A proper fix is still needed.
1 parent d0ebb21 commit 19dbdea

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
### Fixed
12+
13+
- Fix timeout increase on Nginx for peertube runner success request
14+
1115
## [5.7.0] - 2025-04-08
1216

1317
### Added

src/tray/templates/services/nginx/configs/marsha.conf.j2

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ server {
4141
location @proxy_to_marsha_app {
4242
proxy_set_header Host $http_host;
4343
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
44+
proxy_connect_timeout 300s;
45+
proxy_send_timeout 300s;
46+
proxy_read_timeout 300s;
4447

4548
proxy_redirect off;
4649
proxy_pass http://marsha-backend;
@@ -106,10 +109,6 @@ server {
106109
location /api/v1/runners {
107110
client_max_body_size 4000m;
108111

109-
proxy_connect_timeout 300s;
110-
proxy_send_timeout 300s;
111-
proxy_read_timeout 300s;
112-
113112
try_files $uri @proxy_to_marsha_app;
114113
}
115114

0 commit comments

Comments
 (0)