From ccddcae5e5820a142771c28558f0c56358df2c8e Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 23 Dec 2010 18:00:10 +0530 Subject: [PATCH] 90 seconds timeout --- etc/init/pandora.conf | 6 ++++-- nginx/vhost.in | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/init/pandora.conf b/etc/init/pandora.conf index 9a0588c7..a511af88 100644 --- a/etc/init/pandora.conf +++ b/etc/init/pandora.conf @@ -16,7 +16,9 @@ script test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var/log/pandora) cd $VENV/pandora exec /usr/bin/sudo -u $USER $VENV/bin/gunicorn_django \ - -b 127.0.0.1:2620 \ + --bind 127.0.0.1:2620 \ + --timeout 90 \ --log-level info --log-file /var/log/pandora/pandora.log \ - -w5 $VENV/pandora/settings.py + --workers 5 \ + $VENV/pandora/settings.py end script diff --git a/nginx/vhost.in b/nginx/vhost.in index d42f13d9..a4886b4b 100644 --- a/nginx/vhost.in +++ b/nginx/vhost.in @@ -26,7 +26,8 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; - + proxy_read_timeout 90; #should be in sync with gunicorn timeout + proxy_connect_timeout 90; #should be in sync with gunicorn timeout if (!-f $request_filename) { proxy_pass http://127.0.0.1:2620; break;