Allow overriding backup timestamp

conf/mongodb-consistent-backup.example.conf

@@ -11,6 +11,9 @@ production:
   #  crl_file: [path]
   #  client_cert_file: [path]
   log_dir: /var/log/mongodb-consistent-backup
+  # This can be set here, but is really designed to override
+  # the default via the command line.
+  #backup-time: yyyymmdd_HHMM (default: current time)
   backup:
     method: mongodump
     name: default

mongodb_consistent_backup/Common/Config.py

@@ -2,6 +2,7 @@
 import mongodb_consistent_backup
 import sys
 
+from datetime import datetime
 from argparse import Action
 from pkgutil import walk_packages
 from yconf import BaseConfiguration
@@ -82,6 +83,9 @@ def makeParser(self):
         parser.add_argument("--ssl.client_cert_file", dest="ssl.client_cert_file", default=None, type=str,
                             help="Path to Client SSL Certificate file in PEM format (for optional client ssl auth)")
         parser.add_argument("-L", "--log-dir", dest="log_dir", help="Path to write log files to (default: disabled)", default='', type=str)
+        parser.add_argument("-T", "--backup-time", dest="backup_time",
+                            default=datetime.now().strftime("%Y%m%d_%H%M"), type=str,
+                            help="Backup timestamp as yyyymmdd_HHMM. (default: current time)")
         parser.add_argument("--lock-file", dest="lock_file", default='/tmp/mongodb-consistent-backup.lock', type=str,
                             help="Location of lock file (default: /tmp/mongodb-consistent-backup.lock)")
         parser.add_argument("--rotate.max_backups", dest="rotate.max_backups", default=0, type=int,

mongodb_consistent_backup/Main.py

@@ -3,7 +3,6 @@
 import signal
 import sys
 
-from datetime import datetime
 from multiprocessing import current_process, Event, Manager
 
 from Archive import Archive
@@ -47,7 +46,6 @@ def __init__(self, prog_name="mongodb-consistent-backup"):
         self.manager                  = Manager()
         self.timer                    = Timer(self.manager)
         self.timer_name               = "%s.%s" % (self.program_name, self.__class__.__name__)
-        self.backup_time              = datetime.now().strftime("%Y%m%d_%H%M")
         self.logger                   = None
         self.current_log_file         = None
         self.backup_log_file          = None
@@ -70,6 +68,7 @@ def __init__(self, prog_name="mongodb-consistent-backup"):
     def setup_config(self):
         try:
             self.config = Config()
+            self.backup_time = self.config.backup_time
         except Exception, e:
             print "Error setting up configuration: '%s'!" % e
             sys.exit(1)

mongodb_consistent_backup/Rotate.py

@@ -47,7 +47,7 @@ def remove(self, ts):
                 logging.debug("Removing backup path: %s" % backup["path"])
                 rmtree(backup["path"])
             except Exception, e:
-                raise OperationError("Unable to remove backup path %s. %s" % backup["path"], e)
+                raise OperationError("Unable to remove backup path %s. %s" % (backup["path"], e))
             if self.previous == backup:
                 self.previous = None
             del self.backups[ts]