From 02377af0ab6ed7cb4b5b4179356027f9fa25f82e Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 22 Oct 2020 13:38:14 +0200 Subject: [PATCH 1/4] added support for COMPILE_TIMEOUT env --- server-ce/settings.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/settings.coffee b/server-ce/settings.coffee index b4cc2abab0..6d44c9d4b1 100644 --- a/server-ce/settings.coffee +++ b/server-ce/settings.coffee @@ -213,7 +213,7 @@ settings = collaborators: -1 dropbox: true versioning: true - compileTimeout: 180 + compileTimeout: process.env["COMPILE_TIMEOUT"] or 180 compileGroup: "standard" trackChanges: true templates: true From a017d08f0551f836b1feab2c394b7179844123c5 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 22 Oct 2020 13:38:33 +0200 Subject: [PATCH 2/4] updated nginx timeout to 4m --- server-ce/nginx/sharelatex.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server-ce/nginx/sharelatex.conf b/server-ce/nginx/sharelatex.conf index 3a10a999f0..eec4bb0938 100644 --- a/server-ce/nginx/sharelatex.conf +++ b/server-ce/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 4m; + proxy_send_timeout 4m; } 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 4m; + proxy_send_timeout 4m; } location /stylesheets { From 1a23887a8531fd1f6e8143c29c13a9eaabc5acd0 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 22 Oct 2020 18:24:40 +0200 Subject: [PATCH 3/4] addressed PR feedback --- server-ce/nginx/sharelatex.conf | 8 ++++---- server-ce/settings.coffee | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server-ce/nginx/sharelatex.conf b/server-ce/nginx/sharelatex.conf index eec4bb0938..8123e65bcd 100644 --- a/server-ce/nginx/sharelatex.conf +++ b/server-ce/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 4m; - proxy_send_timeout 4m; + 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 4m; - proxy_send_timeout 4m; + proxy_read_timeout 10m; + proxy_send_timeout 10m; } location /stylesheets { diff --git a/server-ce/settings.coffee b/server-ce/settings.coffee index 6d44c9d4b1..2bb812f6b2 100644 --- a/server-ce/settings.coffee +++ b/server-ce/settings.coffee @@ -213,7 +213,7 @@ settings = collaborators: -1 dropbox: true versioning: true - compileTimeout: process.env["COMPILE_TIMEOUT"] or 180 + compileTimeout: parseInt(process.env["COMPILE_TIMEOUT"]) or 180 compileGroup: "standard" trackChanges: true templates: true From a1109d3a1eeb389de79e1d2e9fbedea914be4ea0 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Fri, 23 Oct 2020 11:58:43 +0200 Subject: [PATCH 4/4] added radix to parseInt() call --- server-ce/settings.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/settings.coffee b/server-ce/settings.coffee index 2bb812f6b2..c7d5631f16 100644 --- a/server-ce/settings.coffee +++ b/server-ce/settings.coffee @@ -213,7 +213,7 @@ settings = collaborators: -1 dropbox: true versioning: true - compileTimeout: parseInt(process.env["COMPILE_TIMEOUT"]) or 180 + compileTimeout: parseInt(process.env["COMPILE_TIMEOUT"] or 180, 10) compileGroup: "standard" trackChanges: true templates: true