From cf7ed8fae7eb2d7e97c465c19072ff52399efbf9 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Sun, 9 Oct 2016 22:52:28 +0300 Subject: [PATCH] Change: catch all exceptions from query runners --- redash/tasks/queries.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/redash/tasks/queries.py b/redash/tasks/queries.py index 83d5c87a5..db5412cc8 100644 --- a/redash/tasks/queries.py +++ b/redash/tasks/queries.py @@ -401,7 +401,14 @@ class QueryExecutor(object): query_runner = self.data_source.query_runner annotated_query = self._annotate_query(query_runner) - data, error = query_runner.run_query(annotated_query) + + try: + data, error = query_runner.run_query(annotated_query) + except Exception as e: + error = unicode(e) + data = None + logging.warning('Unexpected error while running query:', exc_info=1) + run_time = time.time() - self.tracker.started_at self.tracker.update(error=error, run_time=run_time, state='saving_results')