X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=1173d8a65d2d5095a9c3c6a1116fd93a680f5c30;hb=6d46ab9b534b60675a3dcb11fcb664589a3691f8;hp=14fc0e385fe66b9ea217450250bb55c5a32a361f;hpb=65ced99bd502d7865074be46d26bed301c805847;p=monitor.git

diff --git a/database.py b/database.py
index 14fc0e3..1173d8a 100644
--- a/database.py
+++ b/database.py
@@ -3,23 +3,20 @@ import sys
 import pickle
 noserial=False
 try:
-	from PHPSerialize import *
-	from PHPUnserialize import *
+	from util.PHPSerialize import *
+	from util.PHPUnserialize import *
 except:
 	#print >>sys.stderr, "PHPSerial db type not allowed."
 	noserial=True
 
 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)