change name from `_format_data` to `_get_data`.

diff --git a/python.d/apache.chart.py b/python.d/apache.chart.py
index 53058388e5983128221f0ee3fa64e1efe9a35b96..bc1540912ffaadf253f823137a60a88d9a39297f 100644 (file)
--- a/python.d/apache.chart.py
+++ b/python.d/apache.chart.py
@@ -86,7 +86,7 @@ class Service(UrlService):
                            "ConnsAsyncClosing": 'closing',
                            "ConnsAsyncWriting": 'writing'}
 
-    def _format_data(self):
+    def _get_data(self):
         """
         Format data received from http request
         :return: dict

diff --git a/python.d/apache_cache.chart.py b/python.d/apache_cache.chart.py
index 69da50c1f514124449130f973c03e1bc2230f4a3..a05b4ba4a48fc06523c8556c9ee0c6a2025ca1fb 100644 (file)
--- a/python.d/apache_cache.chart.py
+++ b/python.d/apache_cache.chart.py
@@ -28,7 +28,7 @@ class Service(LogService):
         self.order = ORDER
         self.definitions = CHARTS
 
-    def _format_data(self):
+    def _get_data(self):
         """
         Parse new log lines
         :return: dict

diff --git a/python.d/mysql.chart.py b/python.d/mysql.chart.py
index 982d2513507a64f7fe0114d999e538b9f3bb92f3..951daf2d2321db046cb1d0d9c56cc648c5f435f7 100644 (file)
--- a/python.d/mysql.chart.py
+++ b/python.d/mysql.chart.py
@@ -355,7 +355,7 @@ class Service(SimpleService):
             self.error("problem connecting to server:", e)
             raise RuntimeError
 
-    def _format_data(self):
+    def _get_data(self):
         """
         Get raw data from MySQL server
         :return: dict

diff --git a/python.d/nginx.chart.py b/python.d/nginx.chart.py
index 8fcac7d181410d9b17028c2eff3e7b68a009d3f0..668209c5d945734920fa702783bbfc3a89a90895 100644 (file)
--- a/python.d/nginx.chart.py
+++ b/python.d/nginx.chart.py
@@ -55,7 +55,7 @@ class Service(UrlService):
         self.order = ORDER
         self.definitions = CHARTS
 
-    def _format_data(self):
+    def _get_data(self):
         """
         Format data received from http request
         :return: dict

diff --git a/python.d/phpfpm.chart.py b/python.d/phpfpm.chart.py
index 938c0edf5a16365319934736008fc28c2d1642c2..e8c01fd015cfb76a6465dac1c113477e40984616 100755 (executable)
--- a/python.d/phpfpm.chart.py
+++ b/python.d/phpfpm.chart.py
@@ -56,7 +56,7 @@ class Service(UrlService):
                            "max children reached": 'reached',
                            "slow requests": 'slow'}
 
-    def _format_data(self):
+    def _get_data(self):
         """
         Format data received from http request
         :return: dict

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index e868ffc3a9e4ba2fc0beec7c8104e185a72626e9..114e9fda7d75b97569aec92840a3d175a109ef42 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -303,16 +303,16 @@ class SimpleService(BaseService):
         self.definitions = {}
         BaseService.__init__(self, configuration=configuration, name=name)
 
-    def _get_data(self):
+    def _get_raw_data(self):
         """
         Get raw data from http request
         :return: str
         """
         return ""
 
-    def _format_data(self):
+    def _get_data(self):
         """
-        Format data received from http request
+        Format data received from request
         :return: dict
         """
         return {}
@@ -328,7 +328,7 @@ class SimpleService(BaseService):
         Create charts
         :return: boolean
         """
-        data = self._format_data()
+        data = self._get_data()
         if data is None:
             return False
 
@@ -351,7 +351,7 @@ class SimpleService(BaseService):
         :param interval: int
         :return: boolean
         """
-        data = self._format_data()
+        data = self._get_data()
         if data is None:
             return False
 
@@ -380,7 +380,7 @@ class UrlService(SimpleService):
         self.url = ""
         SimpleService.__init__(self, configuration=configuration, name=name)
 
-    def _get_data(self):
+    def _get_raw_data(self):
         """
         Get raw data from http request
         :return: str
@@ -412,7 +412,7 @@ class UrlService(SimpleService):
         except (KeyError, TypeError):
             pass
 
-        if self._format_data() is not None:
+        if self._get_data() is not None:
             return True
         else:
             return False
@@ -430,7 +430,7 @@ class LogService(SimpleService):
         SimpleService.__init__(self, configuration=configuration, name=name)
         self.retries = 100000  # basically always retry
 
-    def _get_data(self):
+    def _get_raw_data(self):
         lines = []
         try:
             if os.path.getsize(self.log_path) < self._last_position: