www/printbadnodes.py

[monitor.git] / database.py

diff --git a/database.py b/database.py
index 14fc0e3..3b5bd65 100644 (file)
--- a/database.py
+++ b/database.py
@@ -11,15 +11,12 @@ except:
 
 import inspect
 import shutil
-from config import config as cfg
-config = cfg()
-
-import monitorconfig
+import config
+import config as monitorconfig
 
 DEBUG= 0
 PICKLE_PATH=monitorconfig.MONITOR_DATA_ROOT
 
-class ExceptionTimeout(Exception): pass
 
 def dbLoad(name, type=None):
        return SPickle().load(name, type)
@@ -114,7 +111,10 @@ class SPickle:
                                raise Exception, "No such file %s" % name
                                
 
+               #import traceback
+               #print traceback.print_stack()
                #print "loading %s" % self.__file(name, type)
+               #sys.stderr.write("-----------------------------\n")
                f = open(self.__file(name, type), 'r')
                if type == None:
                        o = pickle.load(f)