Просмотр исходного кода

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

Expose COMPILE_TIMEOUT env variable and update nginx timeouts
Miguel Serrano 5 лет назад
Родитель
Сommit
937e4b31b7
2 измененных файлов с 5 добавлено и 5 удалено
  1. 4 4
      nginx/sharelatex.conf
  2. 1 1
      settings.coffee

+ 4 - 4
nginx/sharelatex.conf

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

+ 1 - 1
settings.coffee

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