From fbfce46ce5742216d334043fd20bf4d9de36d04f Mon Sep 17 00:00:00 2001 From: devon-mar Date: Mon, 2 Nov 2020 22:39:06 -0800 Subject: [PATCH 1/2] Fix TypeError when using LOGIN_TIMEOUT --- configuration/configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index 639e1b6ea..bd6b8b427 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -157,7 +157,7 @@ def _read_secret(secret_name, default = None): # The length of time (in seconds) for which a user will remain logged into the web UI before being prompted to # re-authenticate. (Default: 1209600 [14 days]) -LOGIN_TIMEOUT = environ.get('LOGIN_TIMEOUT', None) +LOGIN_TIMEOUT = int(environ.get('LOGIN_TIMEOUT', None)) # Setting this to True will display a "maintenance mode" banner at the top of every page. MAINTENANCE_MODE = environ.get('MAINTENANCE_MODE', 'False').lower() == 'true' From 4276c941ebd03b91b30f5010873da3795129230a Mon Sep 17 00:00:00 2001 From: devon-mar Date: Tue, 3 Nov 2020 14:57:12 -0800 Subject: [PATCH 2/2] Change LOGIN_TIMEOUT default to int MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christian Mäder --- configuration/configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index bd6b8b427..c49c7e024 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -157,7 +157,7 @@ def _read_secret(secret_name, default = None): # The length of time (in seconds) for which a user will remain logged into the web UI before being prompted to # re-authenticate. (Default: 1209600 [14 days]) -LOGIN_TIMEOUT = int(environ.get('LOGIN_TIMEOUT', None)) +LOGIN_TIMEOUT = int(environ.get('LOGIN_TIMEOUT', 1209600)) # Setting this to True will display a "maintenance mode" banner at the top of every page. MAINTENANCE_MODE = environ.get('MAINTENANCE_MODE', 'False').lower() == 'true'