From 28e26a1bafe2636e52e2a1acbbe4de293b4e73d5 Mon Sep 17 00:00:00 2001
From: Hossein Shafagh <hshafagh@netflix.com>
Date: Wed, 5 Jun 2019 17:57:11 -0700
Subject: [PATCH 1/2] to prevent duplicate emails, we might better remove owner
 and security email address from the notification recipient

---
 lemur/notifications/messaging.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lemur/notifications/messaging.py b/lemur/notifications/messaging.py
index 919b73db..928febd6 100644
--- a/lemur/notifications/messaging.py
+++ b/lemur/notifications/messaging.py
@@ -140,12 +140,6 @@ def send_expiration_notifications(exclude):
                 notification_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(
                 "expiration", notification_data, [owner], notification
             ):
@@ -153,10 +147,16 @@ def send_expiration_notifications(exclude):
             else:
                 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 (
                 notification_recipient
-                and owner != notification_recipient
-                and security_email != notification_recipient
             ):
                 if send_notification(
                     "expiration",

From 0446aea20e67452b7ecc3afaf408ef70c00f46e6 Mon Sep 17 00:00:00 2001
From: Curtis <castrapel@users.noreply.github.com>
Date: Thu, 6 Jun 2019 13:35:45 -0700
Subject: [PATCH 2/2] Update messaging.py

---
 lemur/notifications/messaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lemur/notifications/messaging.py b/lemur/notifications/messaging.py
index 928febd6..82db7b6e 100644
--- a/lemur/notifications/messaging.py
+++ b/lemur/notifications/messaging.py
@@ -52,7 +52,7 @@ def get_certificates(exclude=None):
 
     certs = []
 
-    for c in windowed_query(q, Certificate.id, 100):
+    for c in windowed_query(q, Certificate.id, 10000):
         if needs_notification(c):
             certs.append(c)