Merge pull request #102 from timvaillancourt/MCB_1.0-bugfix13

MCB_1.0: Fix stacktrace when using NSCA

Author: timvaillancourt

mongodb_consistent_backup/Common/Config.py

@@ -31,6 +31,20 @@ def __call__(self, parser, namespace, values, option_string=None):
 
 
 class ConfigParser(BaseConfiguration):
+    def makeParserLoadSubmodules(self, parser):
+        for _, modname, ispkg in walk_packages(path=mongodb_consistent_backup.__path__, prefix=mongodb_consistent_backup.__name__+'.'):
+            if not ispkg:
+                continue
+            try:
+                components = modname.split('.')
+                mod = __import__(components[0])
+                for comp in components[1:]:
+                    mod = getattr(mod, comp)
+                parser = mod.config(parser)
+            except AttributeError, e:
+                continue
+        return parser
+
     def makeParser(self):
         parser = super(ConfigParser, self).makeParser()
         parser.add_argument("-V", "--version", dest="version", help="Print mongodb_consistent_backup version info and exit", action=PrintVersions)
@@ -47,14 +61,13 @@ def makeParser(self):
         parser.add_argument("--lock-file", dest="lock_file", help="Location of lock file (default: /tmp/mongodb_consistent_backup.lock)", default='/tmp/mongodb_consistent_backup.lock', type=str)
         parser.add_argument("--sharding.balancer.wait_secs", dest="sharding.balancer.wait_secs", help="Maximum time to wait for balancer to stop, in seconds (default: 300)", default=300, type=int)
         parser.add_argument("--sharding.balancer.ping_secs", dest="sharding.balancer.ping_secs", help="Interval to check balancer state, in seconds (default: 3)", default=3, type=int)
-        return parser
+        return self.makeParserLoadSubmodules(parser)
 
 
 class Config(object):
     # noinspection PyUnusedLocal
     def __init__(self):
         self._config = ConfigParser()
-        self.parse_submodules()
         self.parse()
 
         self.version    = mongodb_consistent_backup.__version__
@@ -69,18 +82,6 @@ def _get(self, keys, data=None):
         else:
             return data[keys]
 
-    def parse_submodules(self):
-        for _, modname, ispkg in walk_packages(path=mongodb_consistent_backup.__path__, prefix=mongodb_consistent_backup.__name__+'.'):
-            if ispkg:
-                try:
-                    components = modname.split('.')
-                    mod = __import__(components[0])
-                    for comp in components[1:]:
-                        mod = getattr(mod, comp)
-                    mod.config(self._config.parser)
-                except AttributeError, e:
-                    continue
-    
     def check_required(self):
         required = [
             'backup.name',

mongodb_consistent_backup/Notify/Nsca/Nsca.py

@@ -20,13 +20,6 @@ def __init__(self, manager, config, timer, base_dir, backup_dir, **kwargs):
         self.failed     = self.critical
         self.notifier   = None
 
-        split = self.server.split(":")
-        self.server_name = split[0]
-        self.server_port = 5667
-        if len(split) == 2:
-            self.server_port = int(split[1])
-        self.server = "%s:%i" % (self.server_name, self.server_port)
-
         self.mode_type  = ''
         self.encryption = 1
         if self.password:
@@ -36,7 +29,13 @@ def __init__(self, manager, config, timer, base_dir, backup_dir, **kwargs):
         req_attrs = ['server', 'check_name', 'check_host']
         for attr in req_attrs:
             if not getattr(self, attr):
-                raise OperationError('NSCA module requires attribute: %s!' % attr)
+                raise OperationError('NSCA notifier module requires attribute: %s!' % attr)
+
+        self.server_name = self.server
+        self.server_port = 5667
+        if ':' in self.server:
+            self.server_name, self.server_port = self.server.split(":")
+        self.server = "%s:%i" % (self.server_name, self.server_port)
 
         try:
             self.notifier = NSCANotifier(