Yuvipanda has submitted this change and it was merged.
Change subject: dynamicproxy: Increase websocket timeout
......................................................................
dynamicproxy: Increase websocket timeout
Bug: T120335
Change-Id: Ib19ca16dd4f37fcad4f18bb3f0837d786df67446
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/nginx.conf
M modules/dynamicproxy/templates/urlproxy.conf
3 files changed, 7 insertions(+), 10 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dynamicproxy/templates/domainproxy.conf
b/modules/dynamicproxy/templates/domainproxy.conf
index f794d98..a84c5a1 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -54,11 +54,6 @@
listen 80;
<%- end -%>
- # Some projects have tools that take data in and process them
- # for a long time. While ideally they should be made async, this
- # is an interim solution that works for now.
- proxy_read_timeout 600s;
-
# People upload large files, and that is okay.
# We can make this larger if need be.
client_max_body_size 128m;
diff --git a/modules/dynamicproxy/templates/nginx.conf
b/modules/dynamicproxy/templates/nginx.conf
index e71efc0..9145d77 100644
--- a/modules/dynamicproxy/templates/nginx.conf
+++ b/modules/dynamicproxy/templates/nginx.conf
@@ -17,6 +17,12 @@
keepalive_timeout 15; # Default of 65 is a bit too high, reducing to
decrease load
types_hash_max_size 2048;
+ # Some projects have tools that take data in and process them
+ # for a long time. While ideally they should be made async, this
+ # is an interim solution that works for now.
+ # This is doubly important for websockets
+ proxy_read_timeout 3600s;
+
include /etc/nginx/mime.types;
default_type application/octet-stream;
@@ -25,4 +31,4 @@
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
-}
\ No newline at end of file
+}
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index 118a1e4..7bf4c64 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -58,10 +58,6 @@
# b) or, if puppet doesn't work, remove the # from the next line and
remove all lines after it (!)
<% if !@error_enabled %>#<% end %>root /var/www/error; default_type
text/html; error_page 503 /errorpage.html; try_files $uri =503;
<% if !@error_enabled %>
- # Some projects have tools that take data in and process them
- # for a long time. While ideally they should be made async, this
- # is an interim solution that works for now.
- proxy_read_timeout 600s;
# People upload large files, and that is okay.
# We can make this larger if need be.
--
To view, visit https://gerrit.wikimedia.org/r/256882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib19ca16dd4f37fcad4f18bb3f0837d786df67446
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
