check for 0 timeout

apache · Feb 15, 2018 · 8d6123e · 8d6123e
1 parent a8294dc
commit 8d6123e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
@@ -272,7 +272,9 @@ def handle_error(msg):
         key = '{}'.format(uuid.uuid4())
         logging.info('Storing results in results backend, key: {}'.format(key))
         json_payload = json.dumps(payload, default=utils.json_iso_dttm_ser)
-        cache_timeout = database.cache_timeout or config.get('CACHE_DEFAULT_TIMEOUT', 0)
+        cache_timeout = database.cache_timeout
+        if cache_timeout is None:
+            cache_timeout = config.get('CACHE_DEFAULT_TIMEOUT', 0)
         results_backend.set(key, utils.zlib_compress(json_payload), cache_timeout)
         query.results_key = key
         query.end_result_backend_time = utils.now_as_float()