Skip to content
Snippets Groups Projects
Commit 0dfe6d58 authored by Graziano Scalamera's avatar Graziano Scalamera
Browse files

Fix url and groups error handling

parent 6dcf9ea3
No related branches found
Tags 1.2.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 5 deletions
src/AlarmMail.py
+ 16
− 5
View file @ 0dfe6d58
......@@ -227,17 +227,23 @@ class AlarmMail (PyTango.Device_4Impl):
link = self.egiga_url+'&start='+start_date+'&stop='+stop_date+'&ts='+att_conf_str+'&show_error='
msg_link = '<a href="'+link+'">'+link+'</a><br>'
url=''
try:
alm_url=alm_url+'<a href="'+params['url']+'">'+params['url']+'</a>'
url=params['url']
except KeyError, e:
url=''
print e
if len(alm_url) == 0:
if len(url) == 0:
if len(msg_link) == 0:
msg = MIMEText('NEW ALARM DETECTED: \nName: ' +params['name'] + '\nMessage: ' + params['msg'] + '\nValues: ' + params['values'] + '\nFormula: ' + params['formula'])
else:
msg = MIMEText('<html><head></head><body><p>NEW ALARM DETECTED: <br>Name: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +params['name'] + '<br>Message: &nbsp;&nbsp;' + params['msg'] + '<br>Values: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['values'] + '<br>Formula: &nbsp;&nbsp;' + params['formula']+'<br><br>HDB++ eGiga link:<br><br>'+msg_link+'</p></body></html>','html')
else:
alm_url='<a href="'+url+'">'+url+'</a>'
if len(msg_link) == 0:
msg = MIMEText('<html><head></head><body><p>NEW ALARM DETECTED: <br>Name: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +params['name'] + '<br>Message: &nbsp;&nbsp;&nbsp;&nbsp;' + params['msg'] + '<br>Alarm URL: &nbsp;' + alm_url + '<br>Values: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['values'] + '<br>Formula: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['formula'],'html')
else:
msg = MIMEText('<html><head></head><body><p>NEW ALARM DETECTED: <br>Name: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +params['name'] + '<br>Message: &nbsp;&nbsp;&nbsp;&nbsp;' + params['msg'] + '<br>Alarm URL: &nbsp;' + alm_url + '<br>Values: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['values'] + '<br>Formula: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['formula']+'<br><br>HDB++ eGiga link:<br><br>'+msg_link+'</p></body></html>','html')
msg['Subject'] = 'ALARMED ' + params['name'] + ' - ' + params['msg']
......@@ -452,18 +458,23 @@ class AlarmMail (PyTango.Device_4Impl):
if len(att_conf_str) > 0:
link = self.egiga_url+'&start='+start_date+'&stop='+stop_date+'&ts='+att_conf_str+'&show_error='
msg_link = '<a href="'+link+'">'+link+'</a><br>'
url=''
try:
alm_url=alm_url+'<a href="'+params['url']+'">'+params['url']+'</a>'
url=params['url']
except KeyError, e:
url=''
print e
if len(alm_url) == 0:
if len(url) == 0:
if len(msg_link) == 0:
msg = MIMEText('NEW ALARM DETECTED: \nName: ' +params['name'] + '\nMessage: ' + params['msg'] + '\nValues: ' + params['values'] + '\nFormula: ' + params['formula'])
else:
msg = MIMEText('<html><head></head><body><p>NEW ALARM DETECTED: <br>Name: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +params['name'] + '<br>Message: &nbsp;&nbsp;' + params['msg'] + '<br>Values: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['values'] + '<br>Formula: &nbsp;&nbsp;' + params['formula']+'<br><br>HDB++ eGiga link:<br><br>'+msg_link+'</p></body></html>','html')
else:
alm_url='<a href="'+url+'">'+url+'</a>'
if len(msg_link) == 0:
msg = MIMEText('<html><head></head><body><p>NEW ALARM DETECTED: <br>Name: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +params['name'] + '<br>Message: &nbsp;&nbsp;&nbsp;&nbsp;' + params['msg'] + '<br>Alarm URL: &nbsp;' + alm_url + '<br>Values: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['values'] + '<br>Formula: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['formula'],'html')
else:
msg = MIMEText('<html><head></head><body><p>NEW ALARM DETECTED: <br>Name: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +params['name'] + '<br>Message: &nbsp;&nbsp;&nbsp;&nbsp;' + params['msg'] + '<br>Alarm URL: &nbsp;' + alm_url + '<br>Values: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['values'] + '<br>Formula: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + params['formula']+'<br><br>HDB++ eGiga link:<br><br>'+msg_link+'</p></body></html>','html')
msg['Subject'] = 'ALARMED ' + params['name'] + ' - ' + params['msg']
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment