change name from `_format_data` to `_get_data`.
paulfantom committed
Jul 3, 2016 at 14:40 UTC
6d758c5130c3f60fc80b9953bcf8567a9dec9d8f
6 files changed
+13
-13
python.d/apache.chart.py
+1
-1
@@ -86,7 +86,7 @@ class Service(UrlService):
86
"ConnsAsyncClosing": 'closing',
87
"ConnsAsyncWriting": 'writing'}
88
89
- def _format_data(self):
89
+ def _get_data(self):
90
"""
91
Format data received from http request
92
:return: dict
python.d/apache_cache.chart.py
+1
-1
@@ -28,7 +28,7 @@ class Service(LogService):
28
self.order = ORDER
29
self.definitions = CHARTS
30
31
- def _format_data(self):
31
+ def _get_data(self):
32
"""
33
Parse new log lines
34
:return: dict
python.d/mysql.chart.py
+1
-1
@@ -355,7 +355,7 @@ class Service(SimpleService):
355
self.error("problem connecting to server:", e)
356
raise RuntimeError
357
358
- def _format_data(self):
358
+ def _get_data(self):
359
"""
360
Get raw data from MySQL server
361
:return: dict
python.d/nginx.chart.py
+1
-1
@@ -55,7 +55,7 @@ class Service(UrlService):
55
self.order = ORDER
56
self.definitions = CHARTS
57
58
- def _format_data(self):
58
+ def _get_data(self):
59
"""
60
Format data received from http request
61
:return: dict
python.d/phpfpm.chart.py
+1
-1
@@ -56,7 +56,7 @@ class Service(UrlService):
56
"max children reached": 'reached',
57
"slow requests": 'slow'}
58
59
- def _format_data(self):
59
+ def _get_data(self):
60
"""
61
Format data received from http request
62
:return: dict
python.d/python_modules/base.py
+8
-8
@@ -303,16 +303,16 @@ class SimpleService(BaseService):
303
self.definitions = {}
304
BaseService.__init__(self, configuration=configuration, name=name)
305
306
- def _get_data(self):
306
+ def _get_raw_data(self):
307
"""
308
Get raw data from http request
309
:return: str
310
"""
311
return ""
312
313
- def _format_data(self):
313
+ def _get_data(self):
314
"""
315
- Format data received from http request
315
+ Format data received from request
316
:return: dict
317
"""
318
return {}
@@ -328,7 +328,7 @@ class SimpleService(BaseService):
328
Create charts
329
:return: boolean
330
"""
331
- data = self._format_data()
331
+ data = self._get_data()
332
if data is None:
333
return False
334
@@ -351,7 +351,7 @@ class SimpleService(BaseService):
351
:param interval: int
352
:return: boolean
353
"""
354
- data = self._format_data()
354
+ data = self._get_data()
355
if data is None:
356
return False
357
@@ -380,7 +380,7 @@ class UrlService(SimpleService):
380
self.url = ""
381
SimpleService.__init__(self, configuration=configuration, name=name)
382
383
- def _get_data(self):
383
+ def _get_raw_data(self):
384
"""
385
Get raw data from http request
386
:return: str
@@ -412,7 +412,7 @@ class UrlService(SimpleService):
412
except (KeyError, TypeError):
413
pass
414
415
- if self._format_data() is not None:
415
+ if self._get_data() is not None:
416
return True
417
else:
418
return False
@@ -430,7 +430,7 @@ class LogService(SimpleService):
430
SimpleService.__init__(self, configuration=configuration, name=name)
431
self.retries = 100000 # basically always retry
432
433
- def _get_data(self):
433
+ def _get_raw_data(self):
434
lines = []
435
try:
436
if os.path.getsize(self.log_path) < self._last_position: