pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[hotfix] adding cache_key in payload

This commit is contained in:
Maxime Beauchemin 2016-04-25 12:41:30 -07:00
parent 7d90f26554
commit 37be01bc12
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caravel/config.py
View File

@ -134,3 +134,7 @@ try:
from caravel_config import * # noqa
except Exception:
pass
if not CACHE_DEFAULT_TIMEOUT:
CACHE_DEFAULT_TIMEOUT = CACHE_CONFIG.get('CACHE_DEFAULT_TIMEOUT')

9
caravel/viz.py
View File

@ -224,12 +224,14 @@ class BaseViz(object):
@property
def cache_timeout(self):
if self.slice and self.slice.cache_timeout:
return self.slice.cache_timeout
if self.datasource.cache_timeout:
return self.datasource.cache_timeout
if hasattr(self.datasource, 'database') \
and self.datasource.database.cache_timeout:
if (
hasattr(self.datasource, 'database') and
self.datasource.database.cache_timeout):
return self.datasource.database.cache_timeout
return config.get("CACHE_DEFAULT_TIMEOUT")
@ -247,6 +249,7 @@ class BaseViz(object):
cache_timeout = self.cache_timeout
payload = {
'cache_timeout': cache_timeout,
'cache_key': cache_key,
'csv_endpoint': self.csv_endpoint,
'data': self.get_data(),
'form_data': self.form_data,
@ -257,7 +260,7 @@ class BaseViz(object):
payload['cached_dttm'] = datetime.now().isoformat().split('.')[0]
logging.info("Caching for the next {} seconds".format(
cache_timeout))
cache.set(cache_key, payload, timeout=self.cache_timeout)
cache.set(cache_key, payload, timeout=cache_timeout)
payload['is_cached'] = is_cached
return self.json_dumps(payload)