add pcu_name to pcufailed_notice

[monitor.git] / monitor / database / dbpickle.py

diff --git a/monitor/database/dbpickle.py b/monitor/database/dbpickle.py
index e795658..5afc733 100644 (file)
--- a/monitor/database/dbpickle.py
+++ b/monitor/database/dbpickle.py
@@ -27,6 +27,10 @@ def cachedRecently(name, length=int(config.cachetime), type=None):
                return true or false based on whether the modified time of the cached
                file is within 'length' minutes.
        """
+       if hasattr(config, 'cachecalls') and not config.cachecalls:
+               # don't use cached calls if cachecalls is false
+               return False
+
        try:
                t = lastModified(name, type)
        except:
@@ -115,7 +119,7 @@ class SPickle:
                Otherwise, it's normal mode, if the file doesn't exist, raise error
                Load the file
                """
-               print "loading %s" % name
+               #print "loading %s" % name
 
                if config.debug:
                        if self.exists("debug.%s" % name, type):