changes for 3.0

[monitor.git] / soltesz.py

diff --git a/soltesz.py b/soltesz.py
index 1c65e15..846a8f6 100644 (file)
--- 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):