change name from _format_data to _get_data.

paulfantom · paulfantom · commit 6d758c5130c3 · 2016-07-03T14:40:22.000+02:00
diff --git a/python.d/apache.chart.py b/python.d/apache.chart.py
@@ -86,7 +86,7 @@ def __init__(self, configuration=None, name=None):
                            "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
@@ -28,7 +28,7 @@ def __init__(self, configuration=None, name=None):
         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
@@ -355,7 +355,7 @@ def _connect(self):
             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
@@ -55,7 +55,7 @@ def __init__(self, configuration=None, name=None):
         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
@@ -56,7 +56,7 @@ def __init__(self, configuration=None, name=None):
                            "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
@@ -303,16 +303,16 @@ def __init__(self, configuration=None, name=None):
         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 @@ def create(self):
         Create charts
         :return: boolean
         """
-        data = self._format_data()
+        data = self._get_data()
         if data is None:
             return False
 
@@ -351,7 +351,7 @@ def update(self, interval):
         :param interval: int
         :return: boolean
         """
-        data = self._format_data()
+        data = self._get_data()
         if data is None:
             return False
 
@@ -380,7 +380,7 @@ def __init__(self, configuration=None, name=None):
         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 @@ def check(self):
         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 @@ def __init__(self, configuration=None, name=None):
         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:
