X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fcommon.py;h=75f76e404bad33c8ac0599d214208feb815475c7;hb=45fea95bb898f254ea7e987d7417e9091885fbee;hp=da174d883c77d7ec96f0f63d19848a58e5325ae6;hpb=3f2acbd8b7761dae4bb02fedd3557e1003cafb43;p=monitor.git

diff --git a/monitor/common.py b/monitor/common.py
index da174d8..75f76e4 100644
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -3,7 +3,6 @@ import time
 import struct
 from monitor import reboot
 from monitor import util
-from monitor import database
 from monitor.wrapper import plc
 
 from datetime import datetime, timedelta
@@ -215,15 +214,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):