Bladeren bron

HUE-5959 [backend] Allow 0 as a setting for conn_max_age

The default config value of 0 caused an exception.
Johan Ahlen 8 jaren geleden
bovenliggende
commit
4c25764
1 gewijzigde bestanden met toevoegingen van 9 en 1 verwijderingen
  1. 9 1
      desktop/core/src/desktop/conf.py

+ 9 - 1
desktop/core/src/desktop/conf.py

@@ -100,6 +100,14 @@ def coerce_positive_integer(integer):
 
 
   return integer
   return integer
 
 
+def coerce_zero_or_positive_integer(integer):
+  integer = int(integer)
+
+  if integer < 0:
+    raise Exception('integer is negative')
+
+  return integer
+
 def is_https_enabled():
 def is_https_enabled():
   """Hue is configured for HTTPS."""
   """Hue is configured for HTTPS."""
   return bool(SSL_CERTIFICATE.get() and SSL_PRIVATE_KEY.get())
   return bool(SSL_CERTIFICATE.get() and SSL_PRIVATE_KEY.get())
@@ -641,7 +649,7 @@ DATABASE = ConfigSection(
     CONN_MAX_AGE=Config(
     CONN_MAX_AGE=Config(
       key='conn_max_age',
       key='conn_max_age',
       help=_('The CONN_MAX_AGE parameter controls db connections persistency in seconds.'),
       help=_('The CONN_MAX_AGE parameter controls db connections persistency in seconds.'),
-      type=coerce_positive_integer,
+      type=coerce_zero_or_positive_integer,
       default=0,
       default=0,
     )
     )
   )
   )