Don't write symlink or log until lock is acquired

Author: timvaillancourt

mongodb_consistent_backup/Logger.py

@@ -28,17 +28,23 @@ def __init__(self, config, backup_time):
     def start(self):
         try:
             logging.basicConfig(level=self.log_level, format=self.log_format)
-            if self.do_file_log:
+        except Exception, e:
+            print("Could not start logger: %s" % e)
+            raise e
+
+    def start_file_logger(self):
+        if self.do_file_log:
+            try:
                 self.current_log_file = os.path.join(self.config.log_dir, "backup.%s.log" % self.backup_name)
                 self.backup_log_file  = os.path.join(self.config.log_dir, "backup.%s.%s.log" % (self.backup_name, self.backup_time))
                 self.file_log = logging.FileHandler(self.backup_log_file)
                 self.file_log.setLevel(self.log_level)
                 self.file_log.setFormatter(logging.Formatter(self.log_format))
                 logging.getLogger('').addHandler(self.file_log)
                 self.update_symlink()
-        except OSError, e:
-            logging.warning("Could not start file log handler, writing to stdout only")
-            pass
+            except OSError, e:
+                logging.warning("Could not start file log handler, writing to stdout only")
+                pass
 
     def close(self):
         if self.file_log:
@@ -61,6 +67,8 @@ def compress(self):
                 gz_log.close()
 
     def update_symlink(self):
+        if not self.do_file_log:
+            return
         if os.path.islink(self.current_log_file):
             self.last_log = os.readlink(self.current_log_file)
             os.remove(self.current_log_file)

mongodb_consistent_backup/Main.py

@@ -55,6 +55,7 @@ def __init__(self, prog_name="mongodb-consistent-backup"):
             self.setup_logger()
             self.setup_signal_handlers()
             self.get_lock()
+            self.logger.start_file_logger()
             self.init()
             self.set_backup_dirs()
             self.get_db_conn()
@@ -116,7 +117,7 @@ def get_lock(self):
             self.lock = Lock(self.config.lock_file)
         except Exception:
             logging.fatal("Could not acquire lock: '%s'! Is another %s process running? Exiting" % (self.config.lock_file, self.program_name))
-            self.cleanup_and_exit(None, None)
+            sys.exit(1)
 
     def release_lock(self):
         if self.lock: