Merge pull request #36 from timvaillancourt/balancer_logging_fix

Balancer logging fix and code cleanup

Author: dbmurphy

.gitignore

@@ -2,3 +2,4 @@ bin
 build
 rpmbuild
 *.pyc
+.idea

MongoBackup/Archiver.py

@@ -35,6 +35,8 @@ def __init__(self, backup_dir, output_file, no_gzip=False, verbose=False, binary
     def close(self, exit_code=None, frame=None):
         if self._command:
             logging.debug("Killing running subprocess/command: %s" % self._command.command)
+            del exit_code
+            del frame
             self._command.close()
 
     def run(self):

MongoBackup/Backup.py

@@ -88,7 +88,7 @@ def __init__(self, options):
                 raise Exception, 'Field: %s is required by %s!' % (field, __name__), None
 
         # Set default lock file:
-	if not self.lock_file:
+        if not self.lock_file:
             self.lock_file = '/tmp/%s.lock' % self.program_name
 
         # Setup logging
@@ -173,9 +173,10 @@ def exception(self, error_message):
     def run(self):
         logging.info("Starting %s version %s (git commit hash: %s)" % (self.program_name, self.version, self.git_commit))
 
+        # noinspection PyBroadException
         try:
             self._lock = Lock(self.lock_file)
-        except Exception, e:
+        except Exception:
             logging.fatal("Could not acquire lock! Is another %s process running? Exiting" % self.program_name)
             sys.exit(1)
 
@@ -335,7 +336,7 @@ def run(self):
                 )
                 self.uploader_s3.run()
             except Exception, e:
-                self.die("Problem performing AWS S3 multipart upload! Error: %s" % e)
+                self.exception("Problem performing AWS S3 multipart upload! Error: %s" % e)
 
         # send notifications of backup state
         if self.notify_nsca:

MongoBackup/Common/DB.py

@@ -50,8 +50,6 @@ def admin_command(self, admin_command, quiet=False):
         while not status and tries < self.retries:
             try:
                 status = self._conn['admin'].command(admin_command)
-                if not status:
-                    raise e
             except Exception, e:
                 if not quiet:
                     logging.error("Error running admin command '%s': %s" % (admin_command, e))
@@ -63,11 +61,12 @@ def admin_command(self, admin_command, quiet=False):
 
     def server_version(self):
         status  = self.admin_command('serverStatus')
-        if 'version' in status:
-            version = status['version'].split('-')[0]
-            return tuple(version.split('.'))
-        else:
-            raise Exception, "Could not get server version using admin command 'serverStatus'! Error: %s"  % e, None
+        try:
+            if 'version' in status:
+                version = status['version'].split('-')[0]
+                return tuple(version.split('.'))
+        except Exception:
+            raise Exception, "Unable to determine version from serverStatus!", None
 
     def connection(self):
         return self._conn

MongoBackup/Common/LocalCommand.py

@@ -5,7 +5,9 @@
 
 
 class LocalCommand:
-    def __init__(self, command, command_flags=[], verbose=False):
+    def __init__(self, command, command_flags=None, verbose=False):
+        if command_flags is None:
+            command_flags = []
         self.command       = command
         self.command_flags = command_flags
         self.verbose       = verbose
@@ -49,7 +51,7 @@ def run(self):
             if len(self.output) > 0:
                 logging.debug("%s command completed with output:\n\t%s" % (self.command, "\n".join(self.output)))
             else:
-                logging.debug("%s command completed" % (self.command))
+                logging.debug("%s command completed" % self.command)
 
     def close(self):
         if self._process:

MongoBackup/Common/Lock.py

@@ -17,7 +17,7 @@ def acquire(self):
             flock(self._lock, LOCK_EX | LOCK_NB)
             logging.debug("Acquired exclusive lock on file: %s" % self.lock_file)
             return self._lock
-        except Exception, e:
+        except Exception:
             logging.debug("Error acquiring lock on file: %s" % self.lock_file)
             if self._lock:
                 self._lock.close()

MongoBackup/Methods/Dump.py

@@ -40,6 +40,8 @@ def __init__(self, response_queue, backup_name, host_port, user, password, authd
     def close(self, exit_code=None, frame=None):
         if self._command:
             logging.debug("Killing running subprocess/command: %s" % self._command.command)
+            del exit_code
+            del frame
             self._command.close()
 
     def run(self):

MongoBackup/Methods/Dumper.py

@@ -1,9 +1,10 @@
 import logging
 
 from fabric.api import hide, settings, local
-from multiprocessing import Process, Queue
+from multiprocessing import Queue
 from time import sleep
 
+
 from MongoBackup.Methods import Dump
 
 

MongoBackup/Notify/NSCA.py

@@ -15,7 +15,7 @@ def __init__(self, server, check_name, check_host, password=None):
         self.critical   = 2
         self.notifier   = None
 
-	split = self.server.split(":")
+        split = self.server.split(":")
         self.server_name = split[0]
         self.server_port = 5667
         if len(split) == 2:

MongoBackup/Oplog/Resolver.py

@@ -89,7 +89,7 @@ def run(self):
                 logging.debug("Deleting tailed oplog file for %s:%s" % (host, port))
                 os.remove(oplog_file)
             except Exception, e:
-                logging.fatal("Deleting of tailed oplog file %s failed! Error: %s" % (tailed_oplog, e))
+                logging.fatal("Deleting of tailed oplog file %s failed! Error: %s" % (oplog_file, e))
                 raise e
 
         logging.info("Done resolving oplogs")