move BaseService to base.py

diff --git a/python.d/mysql.chart.py b/python.d/mysql.chart.py
index f9728047ae0f5e620439e9630f8246e9e4e9d478..d285c7389fdbecf7a75abce23ba9c5b42b3d0af0 100644 (file)
--- a/python.d/mysql.chart.py
+++ b/python.d/mysql.chart.py
@@ -17,6 +17,8 @@ except ImportError:
     except ImportError:
         sys.stderr.write(NAME + ": You need to install PyMySQL module to use mysql.chart.py plugin\n")
 
+from base import BaseService
+
 # default configuration (overriden by python.d.plugin)
 config = [
     {
@@ -323,53 +325,6 @@ CHARTS = {
 }
 
 
-class BaseService(object):
-    def __init__(self,configuration,update_every,priority,retries):
-        if configuration is None:
-            # use defaults
-            configuration = config
-            self.error(NAME+": no configuration supplied. using defaults.")
-
-        self._parse_base_config(configuration,update_every,priority,retries)
-
-    def _parse_base_config(self,config,update_every,priority,retries):
-        # parse configuration options to run this Service
-        try:
-            self.update_every = int(config['update_every'])
-        except (KeyError, ValueError):
-            self.update_every = update_every
-        try:
-            self.priority = int(config['priority'])
-        except (KeyError, ValueError):
-            self.priority = priority
-        try:
-            self.retries = int(config['retries'])
-        except (KeyError, ValueError):
-            self.retries = retries
-        self.retries_left = self.retries
-
-    def error(self, msg, exception=""):
-        if exception != "":
-            exception = " " + str(exception).replace("\n"," ")
-        sys.stderr.write(str(msg)+exception+"\n")
-        sys.stderr.flush()
-
-    def check(self):
-        # TODO notify about not overriden function
-        self.error("Where is your check()?")
-        return False
-
-    def create(self):
-        # TODO notify about not overriden function
-        self.error("Where is your create()?")
-        return False
-
-    def update(self):
-        # TODO notify about not overriden function
-        self.error("Where is your update()?")
-        return False
-
-
 class Service(BaseService):
     def __init__(self,configuration=None,update_every=3,priority=90000,retries=2):
         super().__init__(configuration,update_every,priority,retries)
@@ -491,6 +446,7 @@ class Service(BaseService):
         return True
 
 if __name__ == "__main__":
+    sys.path.append("./python_modules")
     my = Service(config[0])
     my.check()
     my.create()

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index 8aa2ee6c0689d145eadf7dcee499c462b8feb5b9..c5013baef8793d75052b204b8b6ef7337d023454 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -2,13 +2,13 @@
 # Author: Pawel Krupa (paulfantom)
 
 class BaseService(object):
-    def __init__(self,configuration,update_every,priority,retries):
-        if configuration is None:
+    def __init__(self,configuration=None,update_every=None,priority=None,retries=None):
+        if None in (configuration,update_every,priority,retries):
             # use defaults
-            configuration = config
-            self.error(NAME+": no configuration supplied. using defaults.")
-
-        self._parse_base_config(configuration)
+            self.error("BaseService: no configuration parameters supplied. Cannot create Service.")
+            raise RuntimeError
+        else:
+            self._parse_base_config(configuration,update_every,priority,retries)
 
     def _parse_base_config(self,config,update_every,priority,retries):
         # parse configuration options to run this Service