merge from:

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

diff --git a/monitor/database/dbpickle.py b/monitor/database/dbpickle.py
index e127791..e795658 100644 (file)
--- a/monitor/database/dbpickle.py
+++ b/monitor/database/dbpickle.py
@@ -1,6 +1,11 @@
 import os
 import sys
 import pickle
+import inspect
+import shutil
+import time
+from monitor import config
+
 noserial=False
 try:
        from util.PHPSerialize import *
@@ -9,14 +14,30 @@ except:
        #print >>sys.stderr, "PHPSerial db type not allowed."
        noserial=True
 
-import inspect
-import shutil
-import config
-import config as monitorconfig
-
 DEBUG= 0
 PICKLE_PATH=config.MONITOR_DATA_ROOT
 
+def lastModified(name, type=None):
+       # TODO: fix for 'debug' mode also.
+       t = SPickle().mtime("production.%s" % name, type)
+       return t
+
+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.
+       """
+       try:
+               t = lastModified(name, type)
+       except:
+               # file doesn't exist or we can't access it.
+               return False
+
+       current_time = time.time()
+       if current_time > t + length*60:
+               return False
+       else:
+               return True
 
 def dbLoad(name, type=None):
        return SPickle().load(name, type)
@@ -74,6 +95,10 @@ class SPickle:
                                raise Exception("No PHPSerializer module available")
 
                        return "%s/%s.phpserial" % (self.path, name)
+
+       def mtime(self, name, type=None):
+               f = os.stat(self.__file(name, type))
+               return f[-2]
                
        def exists(self, name, type=None):
                return os.path.exists(self.__file(name, type))