Merge pull request #236 from Helene/query_error_response

Improve error handing raised by Query building

Author: Helene

source/collector.py

@@ -24,7 +24,7 @@
 import copy
 import analytics
 from queryHandler.Query import Query
-from messages import MSG, ERR
+from messages import MSG
 from collections import defaultdict
 from typing import Optional, Any, List
 from threading import Thread
@@ -214,9 +214,7 @@ def get_zimon_query(self):
         query.rawData = self.rawData
 
         if not self.metricsaggr and not self.sensor:
-            self.logger.error(MSG['QueryError'].
-                              format('Missing metric or sensor name'))
-            raise cherrypy.HTTPError(400, ERR[400])
+            raise ValueError('Missing metric or sensor name')
 
         if self.metricsaggr:
             for key, value in self.metricsaggr.items():
@@ -341,7 +339,12 @@ def _calc_ds_interval(self) -> int:
     def _collect(self):
         '''Executes zimon query and returns results'''
 
-        res = self.md.qh.runQuery(self.query)
+        try:
+            res = self.md.qh.runQuery(self.query)
+        except Exception as e:
+            self.logger.error(MSG['QueryError'].format(e))
+            return
+
         if res is None:
             self.logger.error(MSG['NoData'])
             # self.stop_collect()