#50

* added var to modify mail on success behaviour
ElfoCompany · Mar 31, 2020 · d4d58c2 · d4d58c2
1 parent eae8cb9
commit d4d58c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/...ns/Configuration/Models/WatcherModels/Abstractions/IAmConfigurationModelWithResolution.cs b/...ns/Configuration/Models/WatcherModels/Abstractions/IAmConfigurationModelWithResolution.cs
@@ -24,5 +24,8 @@ public interface IAmConfigurationModelWithResolution : IAmBaseConfigurationModel
 
         [JsonProperty(PropertyName = "sendReminderEmailAfterRetryCount")]
         public int SendReminderEmailAfterRetryCount { get; set; }
+
+        [JsonProperty(PropertyName = "sendSuccessMailOnlyIfMaxRetryCountExceeded")]
+        public bool SendSuccessMailOnlyIfMaxRetryCountExceeded { get; set; }
     }
 }
diff --git a/...rdein.Abstractions/Configuration/Models/WatcherModels/GenericServiceConfigurationModel.cs b/...rdein.Abstractions/Configuration/Models/WatcherModels/GenericServiceConfigurationModel.cs
@@ -31,5 +31,7 @@ public class GenericServiceConfigurationModel : IAmConfigurationModelWithResolut
         public string RestoredMessage { get; set; }
         [JsonProperty(PropertyName = "maxRetryCount")]
         public int MaxRetryCount { get; set; } = 2;
+        [JsonProperty(PropertyName = "sendSuccessMailOnlyIfMaxRetryCountExceeded")]
+        public bool SendSuccessMailOnlyIfMaxRetryCountExceeded { get; set; } = false;
     }
 }
diff --git a/Elfo.Wardein.Abstractions/Configuration/Models/WatcherModels/WebWatcherConfigurationModel.cs b/Elfo.Wardein.Abstractions/Configuration/Models/WatcherModels/WebWatcherConfigurationModel.cs
@@ -43,6 +43,8 @@ public class WebWatcherConfigurationModel : IAmConfigurationModelWithResolution
         public object Body { get; set; } = null;
         [JsonProperty(PropertyName = "headers")]
         public IDictionary<string, string> Headers { get; set; }
+        [JsonProperty(PropertyName = "sendSuccessMailOnlyIfMaxRetryCountExceeded")]
+        public bool SendSuccessMailOnlyIfMaxRetryCountExceeded { get; set; } = false;
     }
 
     public enum HttpCallApiMethod

diff --git a/Elfo.Wardein.Watchers/WardeinWatcherWithResolution.cs b/Elfo.Wardein.Watchers/WardeinWatcherWithResolution.cs
@@ -51,7 +51,7 @@ protected virtual async Task PerformActionOnServiceAlive(WatcherStatusResult wat
             try
             {
                 log.Debug($"{GetLoggingDisplayName} is active");
-                if (!watcherStatusResult.PreviousStatus)
+                if (HasToSendMailOnServiceAlive(watcherStatusResult))
                 {
                     log.Debug($"Send Restored Notification for {GetLoggingDisplayName}");
                     await notificationService.SendNotificationAsync(Config.RecipientAddresses, Config.RestoredMessage,
@@ -63,5 +63,13 @@ await notificationService.SendNotificationAsync(Config.RecipientAddresses, Confi
                 log.Error(ex, $"Unable to send email from {GetLoggingDisplayName} watcher");
             }
         }
+
+        protected virtual bool HasToSendMailOnServiceAlive(WatcherStatusResult watcherStatusResult)
+        {
+            if (Config.SendSuccessMailOnlyIfMaxRetryCountExceeded)
+                return watcherStatusResult.FailureCount > Config.MaxRetryCount;
+            else
+                return !watcherStatusResult.PreviousStatus;
+        }
     }
 }