allow removal of notification config section

saltydk · Nov 20, 2021 · c22bbc4 · c22bbc4
1 parent 8b06ad4
commit c22bbc4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Models/NotificationConfig.cs b/Models/NotificationConfig.cs
@@ -5,8 +5,8 @@ namespace SARotate.Models
     public class NotificationConfig
     {
         [YamlDotNet.Serialization.YamlMember(Alias = "errors_only")]
-        public bool AppriseNotificationsErrorsOnly { get; set; }
+        public bool AppriseNotificationsErrorsOnly { get; set; } = true;
         [YamlDotNet.Serialization.YamlMember(Alias = "apprise")]
-        public List<string> AppriseServices { get; set; }
+        public List<string> AppriseServices { get; set; } = new List<string>();
     }
 }
diff --git a/Models/SARotateConfig.cs b/Models/SARotateConfig.cs
@@ -17,7 +17,7 @@ public class SARotateConfig
         /// <summary>
         /// svcAcctGroup absolute path -> remote -> connection info 
         /// </summary>
-        [YamlMember(Alias = "notification")] public NotificationConfig NotificationConfig { get; set; }
+        [YamlMember(Alias = "notification")] public NotificationConfig NotificationConfig { get; set; } = new NotificationConfig();
 
         // ReSharper disable once InconsistentNaming
         public static SARotateConfig? ParseSARotateYamlConfig(string configAbsolutePath)

diff --git a/SARotate.cs b/SARotate.cs
@@ -459,7 +459,7 @@ private async Task LogRCloneServiceAccountSwapResult(
 
         private async Task SendAppriseNotification(SARotateConfig yamlConfigContent, string logMessage, LogLevel logLevel = LogLevel.Debug)
         {
-            if (yamlConfigContent.NotificationConfig.AppriseNotificationsErrorsOnly && logLevel < LogLevel.Error)
+            if (yamlConfigContent.NotificationConfig.AppriseNotificationsErrorsOnly && yamlConfigContent.NotificationConfig.AppriseServices.Any() && logLevel < LogLevel.Error)
             {
                 LogMessage($"apprise notification not sent due to errors_only notifications: {logMessage}", logLevel);
             }