From 4ef59600cb8c3072e20c277788fc39acb0598cd4 Mon Sep 17 00:00:00 2001
From: Art Lukyanchyk <artiom.lukyanchyk@hs-hannover.de>
Date: Mon, 13 May 2019 11:06:54 +0200
Subject: [PATCH] Improve the CONN_MAX_AGE check

---
 pikatasks/django_compat.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pikatasks/django_compat.py b/pikatasks/django_compat.py
index 4b53757..3c4d3c1 100644
--- a/pikatasks/django_compat.py
+++ b/pikatasks/django_compat.py
@@ -39,9 +39,9 @@ def close_db_connections():
 
 @requires_django
 def check_worker_db_settings():
-    t = int(django_conf.settings.CONN_MAX_AGE)
-    if not t or t > 20 * 60:
-        raise ValueError("When using django, CONN_MAX_AGE must be set to a sane value. The current value: {t} seconds.".format(t=t))
+    conn_age_acceptable = range(10, 20 * 60)  # in seconds
+    if getattr(django_conf.settings, "CONN_MAX_AGE", 0) not in conn_age_acceptable:
+        raise ValueError("When using django, CONN_MAX_AGE must be set to a reasonable value. Accepted: {0}".format(conn_age_acceptable))
 
 
 @requires_django
-- 
GitLab