Merge pull request #103 from timvaillancourt/MCB_1.0-bugfix14

MCB_1.0: Fixes for wrong NSCA/Nagios exit code on success

Author: timvaillancourt

mongodb_consistent_backup/Main.py

@@ -443,10 +443,11 @@ def run(self):
 
         # send notifications of backup state
         try:
-            self.notify.notify("%s: backup '%s' succeeded in %s secs" % (
+            self.notify.notify("%s: '%s/%s' succeeded in %.2f secs" % (
                 self.program_name,
                 self.config.backup.name,
-                self.timer.duration(self.timer)
+                self.backup_time,
+                self.timer.duration(self.timer_name)
             ), True)
             self.notify.run()
             self.notify.close()

mongodb_consistent_backup/Notify/Notify.py

@@ -27,7 +27,7 @@ def run(self, *args):
                     state = self._task.failed
                     if success:
                         state = self._task.success
-                    self._task.run(success, message)
+                    self._task.run(state, message)
                 except:
                     continue
             self.timers.stop(self.stage)

mongodb_consistent_backup/Notify/Nsca/Nsca.py

@@ -60,6 +60,7 @@ def run(self, ret_code, output):
                 self.check_name,
                 self.server
             ))
+            logging.debug('NSCA report message: "%s", return code: %i, check host/name: "%s/%s"' % (output, ret_code, self.check_host, self.check_name))
             # noinspection PyBroadException
             try:
                 self.notifier.svc_result(self.check_host, self.check_name, ret_code, str(output))