X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=3b5bd654e6bb0e9e2fdf87c922a7805108afd8ad;hb=944d143a6528c4157b71f51ed480aec806cbaa06;hp=14fc0e385fe66b9ea217450250bb55c5a32a361f;hpb=65ced99bd502d7865074be46d26bed301c805847;p=monitor.git

diff --git a/database.py b/database.py
index 14fc0e3..3b5bd65 100644
--- 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)