X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fcommon.py;h=d3dc895ead981ecbbebb33f683f649afcf5933c8;hb=57fc3f2c580971f7a31c708764557d6273b83216;hp=9878d527bd4023838bfb6649647473a70a0f87ca;hpb=2c3be2b58bc07001f1b221135997f6a0d45477a6;p=monitor.git

diff --git a/monitor/common.py b/monitor/common.py
index 9878d52..d3dc895 100644
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -4,7 +4,7 @@ import struct
 from monitor import reboot
 from monitor import util
 from monitor import database
-from monitor.wrapper import plc, plccache
+from monitor.wrapper import plc
 
 from datetime import datetime, timedelta
 from monitor.model import Message
@@ -187,6 +187,7 @@ def get_nodeset(config):
 		Given the config values passed in, return the set of hostnames that it
 		evaluates to.
 	"""
+	from monitor.wrapper import plccache
 	api = plc.getAuthAPI()
 	l_nodes = plccache.l_nodes
 
@@ -214,15 +215,20 @@ def get_nodeset(config):
 
 	return l_nodes
 
-def email_exception(content=None):
+def email_exception(content=None, title=None):
     import config
     from monitor.model import Message
     import traceback
     msg=traceback.format_exc()
     if content:
         msg = content + "\n" + msg
-    m=Message("exception running monitor", msg, False)
-    m.send([config.cc_email])
+
+    full_title = "exception running monitor"
+    if title:
+        full_title = "exception running monitor %s" % title
+
+    m=Message(full_title, msg, False)
+    m.send([config.exception_email])
     return
 
 def changed_lessthan(last_changed, days):