X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=soltesz.py;h=846a8f6c9eb6723bf92d66948521bb164896fbeb;hb=refs%2Fheads%2F1.0;hp=1c65e15de7b82ddfdf341e708d0faa9e00aeb34b;hpb=77f84f1e8242cdc45eb091ab65eef940a23493a6;p=monitor.git

diff --git a/soltesz.py b/soltesz.py
index 1c65e15..846a8f6 100644
--- a/soltesz.py
+++ b/soltesz.py
@@ -11,11 +11,12 @@ except:
 
 import inspect
 import shutil
-from config2 import config
-config = config()
+import config
+
+import config
 
 DEBUG= 0
-PICKLE_PATH="pdb"
+PICKLE_PATH=config.MONITOR_DATA_ROOT
 
 class ExceptionTimeout(Exception): pass
 
@@ -183,6 +184,8 @@ class CMD:
 			return CMD.run(self,cmd,timeout)
 		except ExceptionTimeout:
 			import traceback; print traceback.print_exc()
+			from nodecommon import email_exception
+			email_exception()
 			return ("", "SCRIPTTIMEOUT")
 			
 	def system(self, cmd, timeout=COMMAND_TIMEOUT*2):