git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added firewall checks and notices
[monitor.git]
/
monitor
/
common.py
diff --git
a/monitor/common.py
b/monitor/common.py
index
da174d8
..
6fca571
100644
(file)
--- a/
monitor/common.py
+++ b/
monitor/common.py
@@
-215,14
+215,19
@@
def get_nodeset(config):
return l_nodes
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
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)
+
+ full_title = "exception running monitor"
+ if title:
+ full_title = "exception running monitor %s" % title
+
+ m=Message(full_title, msg, False)
m.send([config.cc_email])
return
m.send([config.cc_email])
return