cleanup

Author: itkovian

lib/vsc/utils/cache.py

@@ -83,7 +83,6 @@ def update(self, key, data, threshold=None):
         @param data: whatever needs to be stored
         @param threshold: time in seconds
         """
-        #old_timestamp, old_data = self.get(key, default=(None, None))
         now = time.time()
         stored = self.set(key=key, value=(now, data), expire=threshold)
 

lib/vsc/utils/nagios.py

@@ -259,15 +259,15 @@ def __init__(self, header, filename, threshold, nagios_username="nagios", world_
         self.nagios_username = nagios_username
 
     def report_and_exit(self):
-        """Unzips the cache file and reads the JSON data back in, prints the data and exits accordingly.
+        """Reads the cache, prints the data and exits accordingly.
 
         If the cache data is too old (now - cache timestamp > self.threshold), a critical exit is produced.
         """
         try:
-            nagios_cache = FileCache(self.filename, True)
+            nagios_cache = FileCache(self.filename)
         except (IOError, OSError):
             logging.critical("Error opening file %s for reading", self.filename)
-            unknown_exit("%s nagios gzipped JSON file unavailable (%s)" % (self.header, self.filename))
+            unknown_exit("%s nagios cache unavailable (%s)" % (self.header, self.filename))
 
         (timestamp, nagios_exit_info) = nagios_cache.load('nagios')
 
@@ -296,7 +296,7 @@ def cache(self, nagios_exit, nagios_message):
             logging.info("Wrote nagios check cache file %s at about %s", self.filename, time.ctime(time.time()))
         except (IOError, OSError):
             # raising an error is ok, since we usually do this as the very last thing in the script
-            logging.error("Cannot save to the nagios gzipped JSON file (%s)", self.filename)
+            logging.error("Cannot save to the nagios cache (%s)", self.filename)
             raise Exception()
 
         try: