create SimpleService
paulfantom committed
Jun 24, 2016 at 11:28 UTC
430940c6c812cb6dff4fb7d5858744a9fdc1b68e
1 file changed
+30
-28
python.d/python_modules/base.py
+30
-28
@@ -295,25 +295,10 @@ class BaseService(threading.Thread):
295
return False
296
297
298
-class UrlService(BaseService):
298
+class SimpleService(BaseService):
299
def __init__(self, configuration=None, name=None):
300
- self.charts = {}
301
- # charts definitions in format:
302
- # charts = {
303
- # 'chart_name_in_netdata': {
304
- # 'options': "parameters defining chart (passed to CHART statement)",
305
- # 'lines': [
306
- # { 'name': 'dimension_name',
307
- # 'options': 'dimension parameters (passed to DIMENSION statement)"
308
- # }
309
- # ]}
310
- # }
300
self.order = []
301
self.definitions = {}
313
- # definitions are created dynamically in create() method based on 'charts' dictionary. format:
314
- # definitions = {
315
- # 'chart_name_in_netdata' : [ charts['chart_name_in_netdata']['lines']['name'] ]
316
- # }
302
self.url = ""
303
BaseService.__init__(self, configuration=configuration, name=name)
304
@@ -322,18 +307,7 @@ class UrlService(BaseService):
307
Get raw data from http request
308
:return: str
309
"""
325
- raw = None
326
- try:
327
- f = urlopen(self.url, timeout=self.update_every)
328
- raw = f.read().decode('utf-8')
329
- except Exception as e:
330
- msg.error(self.__module__, str(e))
331
- finally:
332
- try:
333
- f.close()
334
- except:
335
- pass
336
- return raw
310
+ return ""
311
312
def _formatted_data(self):
313
"""
@@ -407,3 +381,31 @@ class UrlService(BaseService):
381
self.commit()
382
383
return updated
384
+
385
+
386
+class UrlService(SimpleService):
387
+ def __init__(self, configuration=None, name=None):
388
+ # definitions are created dynamically in create() method based on 'charts' dictionary. format:
389
+ # definitions = {
390
+ # 'chart_name_in_netdata' : [ charts['chart_name_in_netdata']['lines']['name'] ]
391
+ # }
392
+ self.url = ""
393
+ SimpleService.__init__(self, configuration=configuration, name=name)
394
+
395
+ def _get_data(self):
396
+ """
397
+ Get raw data from http request
398
+ :return: str
399
+ """
400
+ raw = None
401
+ try:
402
+ f = urlopen(self.url, timeout=self.update_every)
403
+ raw = f.read().decode('utf-8')
404
+ except Exception as e:
405
+ msg.error(self.__module__, str(e))
406
+ finally:
407
+ try:
408
+ f.close()
409
+ except:
410
+ pass
411
+ return raw