Start uploader earlier, also use .exception() instead of plain-raise

Author: timvaillancourt

mongodb_consistent_backup/Common/DB.py

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

mongodb_consistent_backup/Main.py

@@ -157,7 +157,7 @@ def run(self):
         try:
             self.notify = Notify(self.config)
         except Exception, e:
-            raise e
+            self.exception("Problem starting notifier! Error: %s" % e)
 
         # Setup the archiver
         try:
@@ -166,7 +166,17 @@ def run(self):
                 self.backup_root_directory, 
             )
         except Exception, e:
-            raise e
+            self.exception("Problem starting archiver! Error: %s" % e)
+
+        # Setup the uploader
+        try:
+            self.upload = Upload(
+                self.config,
+                self.backup_root_directory,
+                self.backup_root_subdirectory
+            )
+        except Exception, e:
+            self.exception("Problem starting uploader! Error: %s" % e)
 
         if not self.is_sharded:
             logging.info("Running backup of %s:%s in replset mode" % (self.config.host, self.config.port))
@@ -293,11 +303,6 @@ def run(self):
 
         # upload backup
         try:
-            self.upload = Upload(
-                self.config,
-                self.backup_root_directory,
-                self.backup_root_subdirectory
-            )
             self.upload.upload()
         except Exception, e:
             self.exception("Problem performing upload of backup! Error: %s" % e)

scripts/build.sh

@@ -97,7 +97,7 @@ if [ -d ${srcdir} ]; then
 	if [ ! -d ${pexdir} ]; then
 		mkdir -p ${pexdir}
 	else
-		rm -f ${pexdir}/build/mongodb_consistent_backup-* 
+		rm -f ${pexdir}/build/mongodb_consistent_backup-*.whl 
 	fi
 	[ ! -d ${bindir} ] && mkdir -p ${bindir}
 	${venvdir}/bin/python2.7 ${venvdir}/bin/pex -o ${output_file} -m ${mod_name} -r ${require_file} --pex-root=${pexdir}  ${builddir}