Merge branch 'master' into allow-empty-redis-password

kobotoolbox · Jun 11, 2020 · 6e10091 · 6e10091
2 parents 3671f00 + abedd94
commit 6e10091
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/helpers/config.py b/helpers/config.py
@@ -28,9 +28,9 @@ class Config:
     DEFAULT_PROXY_PORT = "8080"
     DEFAULT_NGINX_PORT = "80"
     DEFAULT_NGINX_HTTPS_PORT = "443"
-    KOBO_DOCKER_BRANCH = 'allow-empty-redis-password'
-    KOBO_INSTALL_BRANCH = 'allow-empty-redis-password'
-    KOBO_INSTALL_VERSION = '2.4.0'
+    KOBO_DOCKER_BRANCH = 'dynamic-uwsgi-pass-timeout'
+    KOBO_INSTALL_BRANCH = 'dynamic-uwsgi-pass-timeout'
+    KOBO_INSTALL_VERSION = '2.4.1'
 
     # Maybe overkill. Use this class as a singleton to get the same configuration
     # for each instantiation.

diff --git a/helpers/template.py b/helpers/template.py
@@ -200,6 +200,7 @@ def _get_value(property_, true_value="", false_value="#",
             "UWSGI_SOFT_LIMIT": int(config.get("uwsgi_soft_limit")) * 1024 * 1024,
             "UWSGI_HARAKIRI": config.get("uwsgi_harakiri"),
             "UWSGI_WORKER_RELOAD_MERCY": config.get("uwsgi_worker_reload_mercy"),
+            "UWSGI_PASS_TIMEOUT": int(config.get("uwsgi_harakiri")) + 10,
             "POSTGRES_REPLICATION_PASSWORD": config.get("postgres_replication_password"),
             "WSGI_SERVER": "runserver_plus" if config_object.dev_mode else "uWSGI",
             "USE_X_FORWARDED_HOST": "" if config_object.dev_mode else "#",

diff --git a/templates/kobo-docker/docker-compose.frontend.override.yml.tpl b/templates/kobo-docker/docker-compose.frontend.override.yml.tpl
@@ -62,6 +62,7 @@ services:
   nginx:
     environment:
       - NGINX_PUBLIC_PORT=${NGINX_PUBLIC_PORT}
+      - UWSGI_PASS_TIMEOUT=${UWSGI_PASS_TIMEOUT}
     ports:
       - ${NGINX_EXPOSED_PORT}:80
     ${USE_EXTRA_HOSTS}extra_hosts: