Fixes to get replset mode working

Author: timvaillancourt

mongodb_consistent_backup/Archive/Archive.py

@@ -1,5 +1,7 @@
 import logging
 
+from Tar import Tar
+
 
 class Archive:
     def __init__(self, config, backup_dir):
@@ -11,15 +13,15 @@ def __init__(self, config, backup_dir):
 
     def init(self):
         archive_method = self.config.archive.method
-        if archive_method is None:
+        if not archive_method or archive_method is "none":
             logging.info("Archiving disabled, skipping")
         else:
             config_vars = ""
             for key in self.config.archive:
                 config_vars += "%s=%s," % (key, self.config.archive[key])
-            logging.info("Using archiving method: %s (options: %s)" % archive_method, config_vars[:-1])
+            logging.info("Using archiving method: %s (options: %s)" % (archive_method, str(config_vars[:-1])))
             try:
-                self._archiver = globals()[archive_method](
+                self._archiver = globals()[archive_method.capitalize()](
                     self.config,
                     self.backup_dir
                 )

mongodb_consistent_backup/Backup/Backup.py

@@ -1,5 +1,7 @@
 import logging
 
+from Mongodump import Mongodump
+
 
 class Backup:
     def __init__(self, config, backup_dir, secondaries, config_server=None):
@@ -13,11 +15,11 @@ def __init__(self, config, backup_dir, secondaries, config_server=None):
 
     def init(self):
         backup_method = self.config.backup.method
-        if backup_method is None:
+        if not backup_method or backup_method is "none":
             raise Exception, 'Must specify a backup method!', None
         logging.info("Using backup method: %s" % backup_method)
         try:
-            self._method = globals()[backup_method](
+            self._method = globals()[backup_method.capitalize()](
                 self.config,
                 self.backup_dir,
                 self.secondaries,

mongodb_consistent_backup/Backup/Mongodump/Mongodump.py

@@ -124,7 +124,7 @@ def run(self):
 
         # start all threads and wait
         logging.info(
-            "Starting backups using mongodump %s (inline gzip: %s, threads per dump: %i)" % (self.version, str(self.dump_gzip), self.threads_per_dump))
+            "Starting backups using mongodump %s (inline gzip: %s, threads per dump: %i)" % (self.version, str(self.do_gzip), self.threads_per_dump))
         for thread in self.threads:
             thread.start()
         self.wait()

mongodb_consistent_backup/Notify/Notify.py

@@ -8,15 +8,14 @@ def __init__(self, config):
 
     def init(self):
         notify_method = self.config.notify.method
-        if notify_method is None:
+        if not notify_method or notify_method is "none":
             logging.info("Notifying disabled, skipping")
-
-        logging.info("Using notify method: %s" % notify_method)
-        try:
-            self._notifier = globals()[notify_method](self.config)
-        except Exception, e:
-            raise e
-
+        else:
+            logging.info("Using notify method: %s" % notify_method)
+            try:
+                self._notifier = globals()[notify_method.capitalize()](self.config)
+            except Exception, e:
+                raise e
 
     def notify(self, message, success=False):
         if self._notifier:

mongodb_consistent_backup/Upload/Upload.py

@@ -14,20 +14,21 @@ def __init__(self, config, base_dir, backup_dir):
 
     def init(self):
         upload_method = self.config.upload.method
-        if upload_method == None:
+        if not upload_method or upload_method is "none":
             logging.info("Uploading disabled, skipping")
-        #TODO Remove this line and move to  S3 Lib for checking
-        # if self.config.upload.method == "s3" and self.config.upload.s3.bucket_name and self.config.upload.s3.bucket_prefix and self.config.upload.s3.access_key and self.config.upload.s3.secret_key:
-
-        logging.info("Using upload method: %s" %  upload_method)
-        try:
-            self._uploader = globals()[upload_method](
-                self.config,
-                self.base_dir,
-                self.backup_dir
-            )
-        except Exception, e:
-            raise Exception, "Problem settings up %s Uploader Error: %s" % (self.config.upload.method,e), None
+        else:
+            #TODO Remove this line and move to  S3 Lib for checking
+            # if self.config.upload.method == "s3" and self.config.upload.s3.bucket_name and self.config.upload.s3.bucket_prefix and self.config.upload.s3.access_key and self.config.upload.s3.secret_key:
+
+            logging.info("Using upload method: %s" % upload_method)
+            try:
+                self._uploader = globals()[upload_method.capitalize()](
+                    self.config,
+                    self.base_dir,
+                    self.backup_dir
+                )
+            except Exception, e:
+                raise Exception, "Problem settings up %s Uploader Error: %s" % (self.config.upload.method, e), None
 
     def upload(self):
         if self._uploader: