From 246abd8bcfa2af205391b7c4f3527c4bf43a3f38 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 13 Sep 2013 10:40:25 -0700 Subject: [PATCH] Don't send an email to foo@bar.com If the user hasn't changed the default, don't even try to send an email to foo@bar.com. --- .../com/netflix/simianarmy/aws/AWSEmailNotifier.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/netflix/simianarmy/aws/AWSEmailNotifier.java b/src/main/java/com/netflix/simianarmy/aws/AWSEmailNotifier.java index 7ff911b2..656d447b 100644 --- a/src/main/java/com/netflix/simianarmy/aws/AWSEmailNotifier.java +++ b/src/main/java/com/netflix/simianarmy/aws/AWSEmailNotifier.java @@ -94,11 +94,14 @@ public boolean isValidEmail(String email) { if (email == null) { return false; } - if (emailPattern.matcher(email).matches()) { - return true; - } else { + if (!emailPattern.matcher(email).matches()) { LOGGER.error(String.format("Invalid email address: %s", email)); return false; } + if (email.equals("foo@bar.com")) { + LOGGER.error(String.format("Email address not changed from default; treating as invalid: %s", email)); + return false; + } + return true; } }