Merge pull request #83 from timvaillancourt/MCB_1.0-walk_packages

Mcb 1.0: use pkgutil.walk_packages to find submodules

Author: timvaillancourt

mongodb_consistent_backup/Common/Config.py

@@ -1,6 +1,7 @@
 import sys
 
 from argparse import Action
+from pkgutil import walk_packages
 from yconf import BaseConfiguration
 
 
@@ -52,11 +53,9 @@ def makeParser(self):
 
 class Config(object):
     # noinspection PyUnusedLocal
-    def __init__(self, cmdline=None, **args):
-        if not self.cmdline:
-            self.cmdline = sys.argv[1:]
+    def __init__(self):
         self._config = ConfigParser()
-        self.parse_submodules(args)
+        self.parse_submodules()
         self.parse()
 
         self.version    = __version__
@@ -71,11 +70,19 @@ def _get(self, keys, data=None):
         else:
             return data[keys]
 
-    def parse_submodules(self, args):
-        if 'submodules' in args:
-            parser = self._config.parser
-            for submodule in args['submodules']:
-                submodule.config(parser)
+    def parse_submodules(self):
+	for _, modname, ispkg in walk_packages(path="."):
+	    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
+	        except Exception, e:
+		    raise e
 
     def check_required(self):
         required = [

mongodb_consistent_backup/Upload/S3/S3Session.py

@@ -1,7 +1,7 @@
 import logging
 
-from boto import config
-from boto.s3.connection import S3Connection
+import boto
+import boto.s3
 
 
 class S3Session:
@@ -13,12 +13,12 @@ def __init__(self, access_key, secret_key, s3_host='s3.amazonaws.com', secure=Tr
         self.num_retries    = num_retries
         self.socket_timeout = socket_timeout
 
-        for section in config.sections():
-            config.remove_section(section)
-        config.add_section('Boto')
-        config.setbool('Boto', 'is_secure', self.secure)
-        config.set('Boto', 'http_socket_timeout', str(self.socket_timeout))
-        config.set('Boto', 'num_retries', str(self.num_retries))
+        for section in boto.config.sections():
+            boto.config.remove_section(section)
+        boto.config.add_section('Boto')
+        boto.config.setbool('Boto', 'is_secure', self.secure)
+        boto.config.set('Boto', 'http_socket_timeout', str(self.socket_timeout))
+        boto.config.set('Boto', 'num_retries', str(self.num_retries))
 
         self._conn = None
         self.connect()
@@ -32,7 +32,7 @@ def connect(self):
         if not self._conn:
             try:
                 logging.debug("Connecting to AWS S3 with Access Key: %s" % self.access_key)
-                self._conn = S3Connection(
+                self._conn = boto.s3.S3Connection(
                     self.access_key,
                     self.secret_key,
                     host=self.s3_host,

mongodb_consistent_backup/__init__.py

@@ -12,14 +12,7 @@
 # noinspection PyUnusedLocal
 def run():
     try:
-        config = Config(submodules=[
-            "Archive",
-            "Backup",
-            "Notify",
-            "Oplog",
-            "Replication",
-            "Upload"
-        ])
+        config = Config()
     except Exception, e:
         print "Error setting up configuration: '%s'!" % e
         sys.exit(1)