Rename parse_submodule -> parse_method, use in Tar+Oplog/Tailer

Author: timvaillancourt

mongodb_consistent_backup/Archive/Archive.py

@@ -1,7 +1,7 @@
 import logging
 
 from Tar import Tar
-from mongodb_consistent_backup.Common import config_to_string, parse_submodule
+from mongodb_consistent_backup.Common import config_to_string, parse_method
 
 
 class Archive:
@@ -15,10 +15,10 @@ def __init__(self, config, backup_dir):
 
     def init(self):
         archive_method = self.config.archive.method
-        if not archive_method or parse_submodule(archive_method) == "none":
+        if not archive_method or parse_method(archive_method) == "none":
             logging.info("Archiving disabled, skipping")
         else:
-            self.method = parse_submodule(archive_method)
+            self.method = parse_method(archive_method)
             logging.info("Using archiving method: %s" % self.method)
             try:
                 self._archiver = globals()[self.method.capitalize()](

mongodb_consistent_backup/Archive/Tar/Tar.py

@@ -6,6 +6,7 @@
 from types import MethodType
 
 from TarThread import TarThread
+from mongodb_consistent_backup.Common import parse_method
 
 
 # Allows pooled .apply_async()s to work on Class-methods:
@@ -28,9 +29,9 @@ def __init__(self, config, backup_base_dir):
 
     def compression(self, method=None):
         if method:
-            self.config.archive.tar.compression = method.lower()
+            self.config.archive.tar.compression = parse_method(method)
             logging.info("Setting tar compression method to: %s" % self.config.archive.tar.compression)
-        return self.config.archive.tar.compression
+        return parse_method(self.config.archive.tar.compression)
 
     def do_gzip(self):
         if self.compression() == 'gzip':

mongodb_consistent_backup/Backup/Backup.py

@@ -1,7 +1,7 @@
 import logging
 
 from Mongodump import Mongodump
-from mongodb_consistent_backup.Common import config_to_string, parse_submodule
+from mongodb_consistent_backup.Common import config_to_string, parse_method
 
 
 class Backup:
@@ -17,9 +17,9 @@ def __init__(self, config, backup_dir, secondaries, config_server=None):
 
     def init(self):
         backup_method = self.config.backup.method
-        if not backup_method or parse_submodule(backup_method) == "none":
+        if not backup_method or parse_method(backup_method) == "none":
             raise Exception, 'Must specify a backup method!', None
-        self.method   = parse_submodule(backup_method)
+        self.method   = parse_method(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:

mongodb_consistent_backup/Common/DB.py

@@ -72,4 +72,5 @@ def connection(self):
         return self._conn
 
     def close(self):
-        return self._conn.close()
+	if self._conn:
+            return self._conn.close()

mongodb_consistent_backup/Common/Util.py

@@ -1,13 +1,14 @@
 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 parse_method(method):
+    return method.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 config_to_string, parse_submodule, validate_hostname 
+from Util import config_to_string, parse_method, validate_hostname 

mongodb_consistent_backup/Notify/Notify.py

@@ -1,6 +1,6 @@
 import logging
 
-from mongodb_consistent_backup.Common import config_to_string, parse_submodule
+from mongodb_consistent_backup.Common import config_to_string, parse_method
 
 
 class Notify:
@@ -13,10 +13,10 @@ def __init__(self, config):
 
     def init(self):
         notify_method = self.config.notify.method
-        if not notify_method or parse_submodule(notify_method) == "none":
+        if not notify_method or parse_method(notify_method) == "none":
             logging.info("Notifying disabled, skipping")
         else:
-            self.method   = parse_submodule(notify_method)
+            self.method   = parse_method(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:

mongodb_consistent_backup/Oplog/Tailer/Tailer.py

@@ -4,6 +4,7 @@
 from time import sleep
 
 from TailerThread import TailerThread
+from mongodb_consistent_backup.Common import parse_method
 
 
 class Tailer:
@@ -22,9 +23,9 @@ def __init__(self, config, secondaries, base_dir):
 
     def compression(self, method=None):
         if method:
-            self.config.oplog.compression = method.lower()
+            self.config.oplog.compression = parse_method(method)
             logging.info("Setting oplog compression method to: %s" % self.config.oplog.compression)
-        return self.config.oplog.compression
+        return parse_method(self.config.oplog.compression)
 
     def do_gzip(self):
         if self.compression() == 'gzip':

mongodb_consistent_backup/Upload/Upload.py

@@ -1,7 +1,7 @@
 import logging
 
 from S3 import S3
-from mongodb_consistent_backup.Common import config_to_string, parse_submodule
+from mongodb_consistent_backup.Common import config_to_string, parse_method
 
 
 class Upload:
@@ -16,10 +16,10 @@ def __init__(self, config, base_dir, backup_dir):
 
     def init(self):
         upload_method = self.config.upload.method
-        if not upload_method or parse_submodule(upload_method) == "none":
+        if not upload_method or parse_method(upload_method) == "none":
             logging.info("Uploading disabled, skipping")
         else:
-            self.method   = parse_submodule(upload_method)
+            self.method   = parse_method(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: