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

Merge pull request #2806 from hosseinsh/duplicate-notifications-(alternative) 

Duplicate notifications (alternative)
This commit is contained in:
Hossein Shafagh 2019-06-06 16:29:55 -07:00 committed by GitHub
parent 3a512d5bda 0446aea20e
commit 29213972ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lemur/notifications/messaging.py
View File

@ -52,7 +52,7 @@ def get_certificates(exclude=None):
certs = [] certs = []
for c in windowed_query(q, Certificate.id, 100): for c in windowed_query(q, Certificate.id, 10000):
if needs_notification(c): if needs_notification(c):
certs.append(c) certs.append(c)
@ -140,12 +140,6 @@ def send_expiration_notifications(exclude):
notification_data.append(cert_data) notification_data.append(cert_data)
security_data.append(cert_data) security_data.append(cert_data)
notification_recipient = get_plugin_option(
"recipients", notification.options
)
if notification_recipient:
notification_recipient = notification_recipient.split(",")
if send_notification( if send_notification(
"expiration", notification_data, [owner], notification "expiration", notification_data, [owner], notification
): ):
@ -153,10 +147,16 @@ def send_expiration_notifications(exclude):
else: else:
failure += 1 failure += 1
notification_recipient = get_plugin_option(
"recipients", notification.options
)
if notification_recipient:
notification_recipient = notification_recipient.split(",")
# removing owner and security_email from notification_recipient
notification_recipient = [i for i in notification_recipient if i not in security_email and i != owner]
if ( if (
notification_recipient notification_recipient
and owner != notification_recipient
and security_email != notification_recipient
): ):
if send_notification( if send_notification(
"expiration", "expiration",