Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into fix_import_v1

This commit is contained in:
Curtis 2018-09-10 10:35:31 -07:00 committed by GitHub
parent 7d42e4ce67 72858e7412
commit c09d8ae630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -1,4 +1,4 @@
include setup.py version.py package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS include setup.py version.py package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS requirements*.txt
recursive-include lemur/plugins/lemur_email/templates * recursive-include lemur/plugins/lemur_email/templates *
recursive-include lemur/static * recursive-include lemur/static *
global-exclude *~ global-exclude *~

6
lemur/notifications/messaging.py
View File

@ -165,6 +165,7 @@ def send_rotation_notification(certificate, notification_plugin=None):
notification_plugin.send('rotation', data, [data['owner']]) notification_plugin.send('rotation', data, [data['owner']])
status = SUCCESS_METRIC_STATUS status = SUCCESS_METRIC_STATUS
except Exception as e: except Exception as e:
current_app.logger.error('Unable to send notification to {}.'.format(data['owner']), exc_info=True)
sentry.captureException() sentry.captureException()
metrics.send('notification', 'counter', 1, metric_tags={'status': status, 'event_type': 'rotation'}) metrics.send('notification', 'counter', 1, metric_tags={'status': status, 'event_type': 'rotation'})
@ -196,6 +197,8 @@ def send_pending_failure_notification(pending_cert, notify_owner=True, notify_se
notification_plugin.send('failed', data, [data['owner']], pending_cert) notification_plugin.send('failed', data, [data['owner']], pending_cert)
status = SUCCESS_METRIC_STATUS status = SUCCESS_METRIC_STATUS
except Exception as e: except Exception as e:
current_app.logger.error('Unable to send pending failure notification to {}.'.format(data['owner']),
exc_info=True)
sentry.captureException() sentry.captureException()
if notify_security: if notify_security:
@ -203,6 +206,9 @@ def send_pending_failure_notification(pending_cert, notify_owner=True, notify_se
notification_plugin.send('failed', data, data["security_email"], pending_cert) notification_plugin.send('failed', data, data["security_email"], pending_cert)
status = SUCCESS_METRIC_STATUS status = SUCCESS_METRIC_STATUS
except Exception as e: except Exception as e:
current_app.logger.error('Unable to send pending failure notification to '
'{}.'.format(data['security_email']),
exc_info=True)
sentry.captureException() sentry.captureException()
metrics.send('notification', 'counter', 1, metric_tags={'status': status, 'event_type': 'rotation'}) metrics.send('notification', 'counter', 1, metric_tags={'status': status, 'event_type': 'rotation'})