From 04b06547b8a8fc5e9a7267e940ce750ce0a042f0 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake.moshenko@coreos.com>
Date: Wed, 18 Feb 2015 16:33:28 -0500
Subject: [PATCH] Remove all of the timeouts since they were not doing the
 right thing anyway.

---
 conf/gunicorn_local.py      | 1 -
 conf/gunicorn_registry.py   | 1 -
 conf/gunicorn_verbs.py      | 1 -
 conf/gunicorn_web.py        | 1 -
 conf/proxy-server-base.conf | 4 ----
 conf/server-base.conf       | 3 ---
 6 files changed, 11 deletions(-)

diff --git a/conf/gunicorn_local.py b/conf/gunicorn_local.py
index 6987041be..49a30682d 100644
--- a/conf/gunicorn_local.py
+++ b/conf/gunicorn_local.py
@@ -1,7 +1,6 @@
 bind = '0.0.0.0:5000'
 workers = 2
 worker_class = 'gevent'
-timeout = 2000
 daemon = False
 logconfig = 'conf/logging_debug.conf'
 pythonpath = '.'
diff --git a/conf/gunicorn_registry.py b/conf/gunicorn_registry.py
index 4f7bb37f2..944608868 100644
--- a/conf/gunicorn_registry.py
+++ b/conf/gunicorn_registry.py
@@ -1,7 +1,6 @@
 bind = 'unix:/tmp/gunicorn_registry.sock'
 workers = 8
 worker_class = 'gevent'
-timeout = 2000
 logconfig = 'conf/logging.conf'
 pythonpath = '.'
 preload_app = True
diff --git a/conf/gunicorn_verbs.py b/conf/gunicorn_verbs.py
index eaf8041df..f329a8cbe 100644
--- a/conf/gunicorn_verbs.py
+++ b/conf/gunicorn_verbs.py
@@ -1,6 +1,5 @@
 bind = 'unix:/tmp/gunicorn_verbs.sock'
 workers = 4
-timeout = 2000
 logconfig = 'conf/logging.conf'
 pythonpath = '.'
 preload_app = True
diff --git a/conf/gunicorn_web.py b/conf/gunicorn_web.py
index bdfa8001a..cb9f78d24 100644
--- a/conf/gunicorn_web.py
+++ b/conf/gunicorn_web.py
@@ -1,7 +1,6 @@
 bind = 'unix:/tmp/gunicorn_web.sock'
 workers = 2
 worker_class = 'gevent'
-timeout = 30
 logconfig = 'conf/logging.conf'
 pythonpath = '.'
 preload_app = True
diff --git a/conf/proxy-server-base.conf b/conf/proxy-server-base.conf
index fb2f3f962..6230dbfd8 100644
--- a/conf/proxy-server-base.conf
+++ b/conf/proxy-server-base.conf
@@ -34,7 +34,6 @@ location /v1/repositories/ {
     proxy_request_buffering off;
 
     proxy_pass http://registry_app_server;
-    proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 
     client_max_body_size 20G;
@@ -48,7 +47,6 @@ location /v1/ {
     proxy_request_buffering off;
 
     proxy_pass   http://registry_app_server;
-    proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 
     client_max_body_size 20G;
@@ -60,7 +58,6 @@ location /c1/ {
     proxy_request_buffering off;
 
     proxy_pass   http://verbs_app_server;
-    proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 
     limit_req zone=api burst=5 nodelay;
@@ -80,7 +77,6 @@ location /v1/_ping {
 
 location ~ ^/b1/controller(/?)(.*) {
     proxy_pass http://build_manager_controller_server/$2;
-    proxy_read_timeout 2000;
 }
 
 location ~ ^/b1/socket(/?)(.*) {
diff --git a/conf/server-base.conf b/conf/server-base.conf
index d5b211c52..4122a99eb 100644
--- a/conf/server-base.conf
+++ b/conf/server-base.conf
@@ -35,7 +35,6 @@ location /v1/ {
     proxy_request_buffering off;
 
     proxy_pass   http://registry_app_server;
-    proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 
     client_max_body_size 20G;
@@ -47,7 +46,6 @@ location /c1/ {
     proxy_request_buffering off;
 
     proxy_pass   http://verbs_app_server;
-    proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 }
 
@@ -65,7 +63,6 @@ location /v1/_ping {
 
 location ~ ^/b1/controller(/?)(.*) {
     proxy_pass http://build_manager_controller_server/$2;
-    proxy_read_timeout 2000;
 }
 
 location ~ ^/b1/socket(/?)(.*) {