Merge pull request #85 from timvaillancourt/MCB_1.0-cleanup_v2

Mcb 1.0 cleanup v2

Author: timvaillancourt

mongodb_consistent_backup/Archive/Tar/Tar.py

@@ -24,14 +24,19 @@ def __init__(self, config, backup_base_dir):
         self.backup_base_dir = backup_base_dir
         self.verbose         = self.config.verbose
         self.binary          = "tar"
-        self.do_gzip         = False
         self._pool           = None
 
     def compression(self, method=None):
         if method:
             self.config.archive.tar.compression = method.lower()
+            logging.info("Setting tar compression method to: %s" % self.config.archive.tar.compression)
         return self.config.archive.tar.compression
 
+    def do_gzip(self):
+        if self.compression() == 'gzip':
+            return True
+        return False
+
     def threads(self, thread_count=None):
         if thread_count:
             self.config.archive.tar.threads = int(thread_count)
@@ -55,11 +60,10 @@ def run(self):
                     subdir_name = "%s/%s" % (self.backup_base_dir, backup_dir)
                     output_file = "%s.tar" % subdir_name
 
-                    if self.compression() == 'gzip':
+                    if self.do_gzip():
                         output_file  = "%s.tgz" % subdir_name
-                        self.do_gzip = True
 
-                    self._pool.apply_async(TarThread(subdir_name, output_file, self.do_gzip, self.verbose, self.binary).run)
+                    self._pool.apply_async(TarThread(subdir_name, output_file, self.do_gzip(), self.verbose, self.binary).run)
             except Exception, e:
                 self._pool.terminate()
                 logging.fatal("Could not create archiving thread! Error: %s" % e)

mongodb_consistent_backup/Backup/Backup.py

@@ -10,24 +10,25 @@ def __init__(self, config, backup_dir, secondaries, config_server=None):
         self.secondaries   = secondaries
         self.config_server = config_server
 
+        self.method  = None
         self._method = None
         self.init()
 
     def init(self):
         backup_method = self.config.backup.method
         if not backup_method or backup_method.lower() == "none":
             raise Exception, 'Must specify a backup method!', None
-        method = backup_method.lower()
-        logging.info("Using backup method: %s" % method)
+        self.method = backup_method.lower()
+        logging.info("Using backup method: %s" % self.method)
         try:
-            self._method = globals()[method.capitalize()](
+            self._method = globals()[self.method.capitalize()](
                 self.config,
                 self.backup_dir,
                 self.secondaries,
                 self.config_server
             )
         except Exception, e:
-            raise Exception, "Problem performing %s! Error: %s" % (method, e), None
+            raise Exception, "Problem performing %s! Error: %s" % (self.method, e), None
 
     def is_compressed(self):
         if self._method:

mongodb_consistent_backup/Notify/Notify.py

@@ -4,6 +4,7 @@ class Notify:
     def __init__(self, config):
         self.config    = config
 
+        self.method    = None
         self._notifier = None
         self.init()
 
@@ -12,10 +13,10 @@ def init(self):
         if not notify_method or notify_method.lower() == "none":
             logging.info("Notifying disabled, skipping")
         else:
-            method = notify_method.lower()
-            logging.info("Using notify method: %s" % method)
+            self.method = notify_method.lower()
+            logging.info("Using notify method: %s" % self.method)
             try:
-                self._notifier = globals()[method.capitalize()](self.config)
+                self._notifier = globals()[self.method.capitalize()](self.config)
             except Exception, e:
                 raise e
 

mongodb_consistent_backup/Oplog/Tailer/Tailer.py

@@ -23,6 +23,7 @@ def __init__(self, config, secondaries, base_dir):
     def compression(self, method=None):
         if method:
             self.config.oplog.compression = method.lower()
+            logging.info("Setting oplog compression method to: %s" % self.config.oplog.compression)
         return self.config.oplog.compression
 
     def do_gzip(self):

mongodb_consistent_backup/Upload/Upload.py

@@ -9,6 +9,7 @@ def __init__(self, config, base_dir, backup_dir):
         self.base_dir   = base_dir
         self.backup_dir = backup_dir
 
+        self.method    = None
         self._uploader = None
         self.init()
 
@@ -17,19 +18,16 @@ def init(self):
         if not upload_method or upload_method.lower() == "none":
             logging.info("Uploading disabled, skipping")
         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:
-
-            method = upload_method.lower()
-            logging.info("Using upload method: %s" % method)
+            self.method = upload_method.lower()
+            logging.info("Using upload method: %s" % self.method)
             try:
-                self._uploader = globals()[method.capitalize()](
+                self._uploader = globals()[self.method.capitalize()](
                     self.config,
                     self.base_dir,
                     self.backup_dir
                 )
             except Exception, e:
-                raise Exception, "Problem settings up %s Uploader Error: %s" % (method, e), None
+                raise Exception, "Problem settings up %s Uploader Error: %s" % (self.method, e), None
 
     def upload(self):
         if self._uploader: