From be3da6396fabeec6c580b9e5ac13670c20d9b9ae Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Thu, 9 Nov 2017 19:09:16 -0800 Subject: [PATCH] Fix misleading SQL Lab timeout error message (#3825) --- superset/views/core.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/superset/views/core.py b/superset/views/core.py index 003115074cd02..73daeac6ad6ba 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -2138,14 +2138,12 @@ def sql_json(self): # Sync request. try: - SQLLAB_TIMEOUT = config.get("SQLLAB_TIMEOUT") - with utils.timeout( - seconds=SQLLAB_TIMEOUT, - error_message=( - "The query exceeded the {SQLLAB_TIMEOUT} seconds " - "timeout. You may want to run your query as a " - "`CREATE TABLE AS` to prevent timeouts." - ).format(**locals())): + timeout = config.get("SQLLAB_TIMEOUT") + timeout_msg = ( + "The query exceeded the {timeout} seconds " + "timeout.").format(**locals()) + with utils.timeout(seconds=timeout, + error_message=timeout_msg): # pylint: disable=no-value-for-parameter data = sql_lab.get_sql_results( query_id=query_id, return_results=True)