From f08757a17267d768e4c3ca4c6979f2a7db25e83c Mon Sep 17 00:00:00 2001
From: jrmfg <117788025+jrmfg@users.noreply.github.com>
Date: Thu, 16 May 2024 12:41:34 -0700
Subject: [PATCH] feat: restore gunicorn worker default configs from 3.5.0
 (#326)

* feat: restore defaults present < 3.6.0, but retain customizability

* revert the test, too

* also restore this assert :)

---------

Co-authored-by: Jeremy Fehr <jfehrforgithub2@gmail.com>
---
 src/functions_framework/_http/gunicorn.py |  6 +++---
 tests/test_http.py                        | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/functions_framework/_http/gunicorn.py b/src/functions_framework/_http/gunicorn.py
index 009a06b7..050f766c 100644
--- a/src/functions_framework/_http/gunicorn.py
+++ b/src/functions_framework/_http/gunicorn.py
@@ -21,9 +21,9 @@ class GunicornApplication(gunicorn.app.base.BaseApplication):
     def __init__(self, app, host, port, debug, **options):
         self.options = {
             "bind": "%s:%s" % (host, port),
-            "workers": os.environ.get("WORKERS", (os.cpu_count() or 1) * 4),
-            "threads": os.environ.get("THREADS", 1),
-            "timeout": os.environ.get("CLOUD_RUN_TIMEOUT_SECONDS", 300),
+            "workers": os.environ.get("WORKERS", 1),
+            "threads": os.environ.get("THREADS", (os.cpu_count() or 1) * 4),
+            "timeout": os.environ.get("CLOUD_RUN_TIMEOUT_SECONDS", 0),
             "loglevel": "error",
             "limit_request_line": 0,
         }
diff --git a/tests/test_http.py b/tests/test_http.py
index 0a46fbea..fbfac9d2 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -97,17 +97,17 @@ def test_gunicorn_application(debug):
     assert gunicorn_app.app == app
     assert gunicorn_app.options == {
         "bind": "%s:%s" % (host, port),
-        "workers": os.cpu_count() * 4,
-        "threads": 1,
-        "timeout": 300,
+        "workers": 1,
+        "threads": os.cpu_count() * 4,
+        "timeout": 0,
         "loglevel": "error",
         "limit_request_line": 0,
     }
 
     assert gunicorn_app.cfg.bind == ["1.2.3.4:1234"]
-    assert gunicorn_app.cfg.workers == os.cpu_count() * 4
-    assert gunicorn_app.cfg.threads == 1
-    assert gunicorn_app.cfg.timeout == 300
+    assert gunicorn_app.cfg.workers == 1
+    assert gunicorn_app.cfg.threads == os.cpu_count() * 4
+    assert gunicorn_app.cfg.timeout == 0
     assert gunicorn_app.load() == app