fix: use the threshold when storing nagios info rather than when reading it

Author: itkovian

lib/vsc/utils/nagios.py

@@ -269,14 +269,16 @@ def report_and_exit(self):
             logging.critical("Error opening file %s for reading", self.filename)
             unknown_exit("%s nagios gzipped JSON file unavailable (%s)" % (self.header, self.filename))
 
-        (timestamp, ((nagios_exit_code, nagios_exit_string), nagios_message)) = nagios_cache.load('nagios')
+        (timestamp, nagios_exit_info) = nagios_cache.load('nagios')
+
+        if nagios_exit_info is None:
+            unknown_exit("%s nagios exit info expired" % self.header)
+
+        ((nagios_exit_code, nagios_exit_string), nagios_message) = nagios_exit_info
+
+        print("%s %s" % (nagios_exit_string, nagios_message))
+        sys.exit(nagios_exit_code)
 
-        if self.threshold <= 0 or time.time() - timestamp < self.threshold:
-            logging.info("Nagios check cache file %s contents delivered: %s", self.filename, nagios_message)
-            print("%s %s" % (nagios_exit_string, nagios_message))
-            sys.exit(nagios_exit_code)
-        else:
-            unknown_exit("%s gzipped JSON file too old (timestamp = %s)" % (self.header, time.ctime(timestamp)))
 
     def cache(self, nagios_exit, nagios_message):
         """Store the result in the cache file with a timestamp.
@@ -289,7 +291,7 @@ def cache(self, nagios_exit, nagios_message):
         """
         try:
             nagios_cache = FileCache(self.filename)
-            nagios_cache.update('nagios', (nagios_exit, nagios_message), 0)  # always update
+            nagios_cache.update('nagios', (nagios_exit, nagios_message), threshold=self.threshold)
             nagios_cache.close()
             logging.info("Wrote nagios check cache file %s at about %s", self.filename, time.ctime(time.time()))
         except (IOError, OSError):

test/nagios.py

@@ -70,7 +70,7 @@ def test_cache(self):
         """Test the caching mechanism in the reporter."""
         length = random.randint(1, 30)
         exit_code = random.randint(0, 3)
-        threshold = random.randint(0, 10)
+        threshold = None
 
         message = ''.join(random.choice(string.printable) for x in range(length))
         message = message.rstrip()