Skip to content

fixing cache timeout setting #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sid88in wants to merge 2 commits into from
Closed

fixing cache timeout setting #210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b76f1
fixing cache timeout setting
Mar 29, 2016
e04f212
fix indentation for gods sake :)
Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions caravel/viz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,15 @@ def get_json(self):
logging.info("Serving from cache")
else:
is_cached = False
cache_timeout = self.cache_timeout
config_cache_timeout = config.get("CACHE_DEFAULT_TIMEOUT")
try:
cache_timeout = self.cache_timeout
except Exception as e:
logging.exception(e)
if config_cache_timeout:
cache_timeout = config_cache_timeout
else:
cache_timeout = 0
payload = {
'data': self.get_data(),
'query': self.query,
Expand All @@ -246,7 +254,7 @@ def get_json(self):
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 dumps(payload)

Expand Down