✨([dogwood|eucalyptus/3/*]) make gunicorn timeout configurable

As some synchronous requests may be quite long (e.g. courses importation), we should make timeout rather high and configurable so that it could be increased without having to make a new release of this image
openfun · Dec 26, 2019 · 2dee6ea · 2dee6ea
1 parent 72055de
commit 2dee6ea
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 4 deletions.
diff --git a/releases/dogwood/3/bare/CHANGELOG.md b/releases/dogwood/3/bare/CHANGELOG.md
@@ -9,6 +9,10 @@ release.
 
 ## [Unreleased]
 
+### Added
+
+- Make Gunicorn timeout configurable via an environment variable
+
 ## [dogwood.3-1.1.5] - 2019-12-24
 
 ### Fixed

diff --git a/releases/dogwood/3/bare/Dockerfile b/releases/dogwood/3/bare/Dockerfile
@@ -267,6 +267,18 @@ USER 10000
 # (defaults to "lms")
 ENV SERVICE_VARIANT=lms
 
+# Gunicorn configuration
+#
+# As some synchronous requests may be quite long (e.g. courses import), we
+# should make timeout rather high and configurable so that it could be
+# increased without having to make a new release of this image
+ENV GUNICORN_TIMEOUT 300
+
 # Use Gunicorn in production as web server
 CMD DJANGO_SETTINGS_MODULE=${SERVICE_VARIANT}.envs.fun.docker_run \
-    gunicorn --name=${SERVICE_VARIANT} --bind=0.0.0.0:8000 --max-requests=1000 ${SERVICE_VARIANT}.wsgi:application
+    gunicorn \
+      --name=${SERVICE_VARIANT} \
+      --bind=0.0.0.0:8000 \
+      --max-requests=1000 \
+      --timeout=${GUNICORN_TIMEOUT} \
+      ${SERVICE_VARIANT}.wsgi:application
diff --git a/releases/dogwood/3/fun/CHANGELOG.md b/releases/dogwood/3/fun/CHANGELOG.md
@@ -9,6 +9,10 @@ release.
 
 ## [Unreleased]
 
+### Added
+
+- Make Gunicorn timeout configurable via an environment variable
+
 ### Fixed
 
 - Move LTI xblock configurations from fun settings to production

diff --git a/releases/dogwood/3/fun/Dockerfile b/releases/dogwood/3/fun/Dockerfile
@@ -268,6 +268,19 @@ USER 10000
 # (defaults to "lms")
 ENV SERVICE_VARIANT=lms
 
+# Gunicorn configuration
+#
+# As some synchronous requests may be quite long (e.g. courses import), we
+# should make timeout rather high and configurable so that it could be
+# increased without having to make a new release of this image
+#
+ENV GUNICORN_TIMEOUT 300
+
 # Use Gunicorn in production as web server
 CMD DJANGO_SETTINGS_MODULE=${SERVICE_VARIANT}.envs.fun.docker_run \
-    gunicorn --name=${SERVICE_VARIANT} --bind=0.0.0.0:8000 --max-requests=1000 ${SERVICE_VARIANT}.wsgi:application
+    gunicorn \
+      --name=${SERVICE_VARIANT} \
+      --bind=0.0.0.0:8000 \
+      --max-requests=1000 \
+      --timeout=${GUNICORN_TIMEOUT} \
+      ${SERVICE_VARIANT}.wsgi:application
diff --git a/releases/eucalyptus/3/bare/CHANGELOG.md b/releases/eucalyptus/3/bare/CHANGELOG.md
@@ -9,6 +9,10 @@ release.
 
 ## [Unreleased]
 
+### Added
+
+- Make Gunicorn timeout configurable via an environment variable
+
 ## [eucalyptus.3-1.0.4] - 2019-12-24
 
 ### Fixed

diff --git a/releases/eucalyptus/3/bare/Dockerfile b/releases/eucalyptus/3/bare/Dockerfile
@@ -238,6 +238,18 @@ USER 10000
 # (defaults to "lms")
 ENV SERVICE_VARIANT=lms
 
+# Gunicorn configuration
+#
+# As some synchronous requests may be quite long (e.g. courses import), we
+# should make timeout rather high and configurable so that it could be
+# increased without having to make a new release of this image
+ENV GUNICORN_TIMEOUT 300
+
 # Use Gunicorn in production as web server
 CMD DJANGO_SETTINGS_MODULE=${SERVICE_VARIANT}.envs.fun.docker_run \
-    gunicorn --name=${SERVICE_VARIANT} --bind=0.0.0.0:8000 --max-requests=1000 ${SERVICE_VARIANT}.wsgi:application
+    gunicorn \
+      --name=${SERVICE_VARIANT} \
+      --bind=0.0.0.0:8000 \
+      --max-requests=1000 \
+      --timeout=${GUNICORN_TIMEOUT} \
+      ${SERVICE_VARIANT}.wsgi:application
diff --git a/releases/eucalyptus/3/wb/CHANGELOG.md b/releases/eucalyptus/3/wb/CHANGELOG.md
@@ -9,6 +9,10 @@ release.
 
 ## [Unreleased]
 
+### Added
+
+- Make Gunicorn timeout configurable via an environment variable
+
 ## [eucalyptus.3-wb-1.2.2] - 2019-12-26
 
 ### Fixed

diff --git a/releases/eucalyptus/3/wb/Dockerfile b/releases/eucalyptus/3/wb/Dockerfile
@@ -238,6 +238,18 @@ USER 10000
 # (defaults to "lms")
 ENV SERVICE_VARIANT=lms
 
+# Gunicorn configuration
+#
+# As some synchronous requests may be quite long (e.g. courses import), we
+# should make timeout rather high and configurable so that it could be
+# increased without having to make a new release of this image
+ENV GUNICORN_TIMEOUT 300
+
 # Use Gunicorn in production as web server
 CMD DJANGO_SETTINGS_MODULE=${SERVICE_VARIANT}.envs.fun.docker_run \
-    gunicorn --name=${SERVICE_VARIANT} --bind=0.0.0.0:8000 --max-requests=1000 ${SERVICE_VARIANT}.wsgi:application
+    gunicorn \
+      --name=${SERVICE_VARIANT} \
+      --bind=0.0.0.0:8000 \
+      --max-requests=1000 \
+      --timeout=${GUNICORN_TIMEOUT} \
+      ${SERVICE_VARIANT}.wsgi:application