patx/gitman

Moved the Gunicorn timeout settings into`app.py` and removed `gunicorn.conf.py`.

Commit 07ec72f · patx · 2026-05-07T18:54:30-04:00

Changeset

07ec72f21503c8055f4baf9af4e9b6260e61384c

Parents

71ee405681dabb3b52f1ee45c6c27cf49af226ba

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/app.py b/app.py
index 0b0ce34..941558a 100644
--- a/app.py
+++ b/app.py
@@ -71,6 +71,9 @@ MAX_IMPORT_BYTES = env_int("GITMAN_MAX_IMPORT_BYTES", 2 * 1024 * 1024 * 1024)
 IMPORT_UPLOAD_CHUNK_BYTES = 1024 * 1024
 IMPORT_UPLOAD_STALE_SECONDS = env_int("GITMAN_IMPORT_UPLOAD_STALE_SECONDS", 6 * 60 * 60, minimum=60)
 GIT_IMPORT_TIMEOUT_SECONDS = env_int("GITMAN_IMPORT_TIMEOUT_SECONDS", 3600, minimum=1)
+# Gunicorn reads these when app.py is used as its config file.
+timeout = env_int("GITMAN_GUNICORN_TIMEOUT_SECONDS", GIT_IMPORT_TIMEOUT_SECONDS + 300, minimum=1)
+graceful_timeout = timeout
 GIT_IMPORT_NICE = env_int("GITMAN_GIT_IMPORT_NICE", 10, minimum=0)
 GIT_IMPORT_PACK_THREADS = env_int("GITMAN_GIT_IMPORT_PACK_THREADS", 1, minimum=1)
 GIT_HTTP_NICE = env_int("GITMAN_GIT_HTTP_NICE", 10, minimum=0)
diff --git a/gunicorn.conf.py b/gunicorn.conf.py
deleted file mode 100644
index a9be4df..0000000
--- a/gunicorn.conf.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-
-def env_int(name, default, minimum=1):
-    try:
-        value = int(os.environ.get(name, str(default)))
-    except ValueError:
-        return default
-    return max(minimum, value)
-
-
-import_timeout = env_int("GITMAN_IMPORT_TIMEOUT_SECONDS", 3600, minimum=1)
-timeout = env_int("GITMAN_GUNICORN_TIMEOUT_SECONDS", import_timeout + 300, minimum=1)
-graceful_timeout = timeout