Merge pull request #805 from overleaf/msm-compile-timeout-env

Expose COMPILE_TIMEOUT env variable and update nginx timeouts
This commit is contained in:
Miguel Serrano 2020-10-23 12:47:12 +02:00 committed by GitHub
commit 937e4b31b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -11,8 +11,8 @@ server {
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 3m; proxy_read_timeout 10m;
proxy_send_timeout 3m; proxy_send_timeout 10m;
} }
location /socket.io { location /socket.io {
@ -23,8 +23,8 @@ server {
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 3m; proxy_read_timeout 10m;
proxy_send_timeout 3m; proxy_send_timeout 10m;
} }
location /stylesheets { location /stylesheets {

View file

@ -213,7 +213,7 @@ settings =
collaborators: -1 collaborators: -1
dropbox: true dropbox: true
versioning: true versioning: true
compileTimeout: 180 compileTimeout: parseInt(process.env["COMPILE_TIMEOUT"] or 180, 10)
compileGroup: "standard" compileGroup: "standard"
trackChanges: true trackChanges: true
templates: true templates: true