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 <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
