Merge pull request #1429 from someones/es_error_propagation

Add missing error check from #1402
getredash · Nov 25, 2016 · 6f52c50 · 6f52c50
2 parents 47c1ac8 + c449bfb
commit 6f52c50
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/redash/query_runner/elasticsearch.py b/redash/query_runner/elasticsearch.py
@@ -369,7 +369,7 @@ def run_query(self, query, user):
             url = "{0}/{1}/_search".format(self.server_url, index_name)
             mapping_url = "{0}/{1}/_mapping".format(self.server_url, index_name)
 
-            mappings = self._get_mappings(mapping_url)
+            mappings, error = self._get_mappings(mapping_url)
             if error:
                 return None, error