Merge pull request #86 from timvaillancourt/MCB_1.0-cleanup_v3

Mcb 1.0 cleanup v3

Author: timvaillancourt

mongodb_consistent_backup/Archive/Archive.py

@@ -1,6 +1,7 @@
 import logging
 
 from Tar import Tar
+from mongodb_consistent_backup.Common import config_to_string, parse_submodule
 
 
 class Archive:
@@ -14,16 +15,18 @@ def __init__(self, config, backup_dir):
 
     def init(self):
         archive_method = self.config.archive.method
-        if not archive_method or archive_method.lower() == "none":
+        if not archive_method or parse_submodule(archive_method) == "none":
             logging.info("Archiving disabled, skipping")
         else:
-            self.method = archive_method.lower()
+            self.method = parse_submodule(archive_method)
             logging.info("Using archiving method: %s" % self.method)
             try:
                 self._archiver = globals()[self.method.capitalize()](
                     self.config,
                     self.backup_dir
                 )
+            except LookupError, e:
+                raise Exception, 'No archiving method: %s' % self.method, None
             except Exception, e:
                 raise e
 
@@ -37,10 +40,8 @@ def threads(self, threads=None):
 
     def archive(self):
         if self._archiver:
-            config_vars = ""
-            for key in self.config.archive:
-                config_vars += "%s=%s," % (key, self.config.archive[key])
-            logging.info("Archiving with method: %s (options: %s)" % (self.method, str(config_vars[:-1])))
+            config_string = config_to_string(self.config.archive[self.method])
+            logging.info("Archiving with method: %s (options: %s)" % (self.method, config_string))
             return self._archiver.run()
 
     def close(self):

mongodb_consistent_backup/Backup/Backup.py

@@ -1,6 +1,7 @@
 import logging
 
 from Mongodump import Mongodump
+from mongodb_consistent_backup.Common import config_to_string, parse_submodule
 
 
 class Backup:
@@ -16,17 +17,20 @@ def __init__(self, config, backup_dir, secondaries, config_server=None):
 
     def init(self):
         backup_method = self.config.backup.method
-        if not backup_method or backup_method.lower() == "none":
+        if not backup_method or parse_submodule(backup_method) == "none":
             raise Exception, 'Must specify a backup method!', None
-        self.method = backup_method.lower()
-        logging.info("Using backup method: %s" % self.method)
+        self.method   = parse_submodule(backup_method)
+        config_string = config_to_string(self.config.backup[self.method])
+        logging.info("Using backup method: %s (options: %s)" % (self.method, config_string))
         try:
             self._method = globals()[self.method.capitalize()](
                 self.config,
                 self.backup_dir,
                 self.secondaries,
                 self.config_server
             )
+        except LookupError, e:
+            raise Exception, 'No backup method: %s' % self.method, None
         except Exception, e:
             raise Exception, "Problem performing %s! Error: %s" % (self.method, e), None
 

mongodb_consistent_backup/Common/Util.py

@@ -1,5 +1,13 @@
 import socket
 
+def config_to_string(config):
+    config_vars = ""
+    for key in config:
+        config_vars += "%s=%s," % (key, config[key])
+    return config_vars[:-1]
+
+def parse_submodule(name):
+    return name.rstrip().lower()
 
 def validate_hostname(hostname):
     try:

mongodb_consistent_backup/Common/__init__.py

@@ -2,4 +2,4 @@
 from DB import DB
 from LocalCommand import LocalCommand
 from Lock import Lock
-from Util import validate_hostname
+from Util import config_to_string, parse_submodule, validate_hostname 

mongodb_consistent_backup/Notify/Notify.py

@@ -1,5 +1,8 @@
 import logging
 
+from mongodb_consistent_backup.Common import config_to_string, parse_submodule
+
+
 class Notify:
     def __init__(self, config):
         self.config    = config
@@ -10,13 +13,16 @@ def __init__(self, config):
 
     def init(self):
         notify_method = self.config.notify.method
-        if not notify_method or notify_method.lower() == "none":
+        if not notify_method or parse_submodule(notify_method) == "none":
             logging.info("Notifying disabled, skipping")
         else:
-            self.method = notify_method.lower()
-            logging.info("Using notify method: %s" % self.method)
+            self.method   = parse_submodule(notify_method)
+            config_string = config_to_string(self.config.notify[self.method])
+            logging.info("Using notify method: %s (options: %s)" % (self.method, config_string))
             try:
                 self._notifier = globals()[self.method.capitalize()](self.config)
+            except LookupError, e:
+                raise Exception, 'No notify method: %s' % self.method, None
             except Exception, e:
                 raise e
 

mongodb_consistent_backup/Upload/Upload.py

@@ -1,6 +1,7 @@
 import logging
 
 from S3 import S3
+from mongodb_consistent_backup.Common import config_to_string, parse_submodule
 
 
 class Upload:
@@ -15,17 +16,20 @@ def __init__(self, config, base_dir, backup_dir):
 
     def init(self):
         upload_method = self.config.upload.method
-        if not upload_method or upload_method.lower() == "none":
+        if not upload_method or parse_submodule(upload_method) == "none":
             logging.info("Uploading disabled, skipping")
         else:
-            self.method = upload_method.lower()
-            logging.info("Using upload method: %s" % self.method)
+            self.method   = parse_submodule(upload_method)
+            config_string = config_to_string(self.config.upload[self.method])
+            logging.info("Using upload method: %s (options: %s)" % (self.method, config_string))
             try:
                 self._uploader = globals()[self.method.capitalize()](
                     self.config,
                     self.base_dir,
                     self.backup_dir
                 )
+            except LookupError, e:
+                raise Exception, 'No upload method: %s' % self.method, None
             except Exception, e:
                 raise Exception, "Problem settings up %s Uploader Error: %s" % (self.method, e), None