Skip to content
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

Jump to bottom

Fix a bug when loading DruidDatasource. #213

Merged
merged 3 commits into from
Mar 31, 2016
Merged

Fix a bug when loading DruidDatasource. #213

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f67c6b5
Fix a bug when loading DruidDatasource.
kim-pham-airbnb Mar 30, 2016
4a77b70
A better fix.
kim-pham-airbnb Mar 30, 2016
e5553ab
Fix lint warning.
kim-pham-airbnb Mar 30, 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
10 changes: 6 additions & 4 deletions caravel/viz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,12 @@ def query_obj(self):
def cache_timeout(self):
if self.slice and self.slice.cache_timeout:
return self.slice.cache_timeout
return (
self.datasource.cache_timeout or
self.datasource.database.cache_timeout or
config.get("CACHE_DEFAULT_TIMEOUT"))
if self.datasource.cache_timeout:
return self.datasource.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")

def get_json(self):
"""Handles caching around the json payload retrieval"""
Expand Down