X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=254a5b53105a4a7d1379749d598d5a9c91188e9d;hb=refs%2Fheads%2F1.0;hp=14fc0e385fe66b9ea217450250bb55c5a32a361f;hpb=65ced99bd502d7865074be46d26bed301c805847;p=monitor.git

diff --git a/database.py b/database.py
index 14fc0e3..254a5b5 100644
--- a/database.py
+++ b/database.py
@@ -3,23 +3,19 @@ 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
 
 DEBUG= 0
-PICKLE_PATH=monitorconfig.MONITOR_DATA_ROOT
+PICKLE_PATH=config.MONITOR_DATA_ROOT
 
-class ExceptionTimeout(Exception): pass
 
 def dbLoad(name, type=None):
 	return SPickle().load(name, type)
@@ -115,6 +111,7 @@ class SPickle:
 				
 
 		#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)