[MediaWiki-commits] [Gerrit] operations/puppet[production]: Nginx timeout should be higher than thumbor subprocess timeout

2016-12-01 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: Nginx timeout should be higher than thumbor subprocess timeout
..


Nginx timeout should be higher than thumbor subprocess timeout

Bug: T151459
Change-Id: Ia93a6611882f69abbd7c29ad5486545317868f3d
---
M modules/thumbor/templates/nginx.conf.erb
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/thumbor/templates/nginx.conf.erb 
b/modules/thumbor/templates/nginx.conf.erb
index 2a7b6d9..1814fa6 100644
--- a/modules/thumbor/templates/nginx.conf.erb
+++ b/modules/thumbor/templates/nginx.conf.erb
@@ -9,7 +9,9 @@
 server {
 listen <%= @listen_port %>;
 
-keepalive_timeout 60;
+# Thumbor subprocesses have a timeout of 60s
+# Set by SUBPROCESS_TIMEOUT in the Thumbor configuration
+keepalive_timeout 90;
 
 location / {
 proxy_redirect off;

-- 
To view, visit https://gerrit.wikimedia.org/r/323403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia93a6611882f69abbd7c29ad5486545317868f3d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Nginx timeout should be higher than thumbor subprocess timeout

2016-11-24 Thread Gilles (Code Review) 
Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/323403

Change subject: Nginx timeout should be higher than thumbor subprocess timeout
..

Nginx timeout should be higher than thumbor subprocess timeout

Bug: T151459
Change-Id: Ia93a6611882f69abbd7c29ad5486545317868f3d
---
M modules/thumbor/templates/nginx.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/323403/1

diff --git a/modules/thumbor/templates/nginx.conf.erb 
b/modules/thumbor/templates/nginx.conf.erb
index 2a7b6d9..45f0249 100644
--- a/modules/thumbor/templates/nginx.conf.erb
+++ b/modules/thumbor/templates/nginx.conf.erb
@@ -9,7 +9,7 @@
 server {
 listen <%= @listen_port %>;
 
-keepalive_timeout 60;
+keepalive_timeout 90;
 
 location / {
 proxy_redirect off;

-- 
To view, visit https://gerrit.wikimedia.org/r/323403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia93a6611882f69abbd7c29ad5486545317868f3d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits