Merge pull request #4858 from Particular/IngestAuditMessages

ramonsmits · web-flow · commit f90154a69746 · 2025-03-11T10:34:41.000+01:00
Also support `ServiceControl.Audit/IngestAuditMessages`
diff --git a/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs b/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs
@@ -64,7 +64,14 @@ void LoadAuditQueueInformation()
                 throw new Exception("ServiceBus/AuditQueue value is required to start the instance");
             }
 
-            IngestAuditMessages = SettingsReader.Read(new SettingsRootNamespace("ServiceControl"), "IngestAuditMessages", true);
+            if (!SettingsReader.TryRead(SettingsRootNamespace, "IngestAuditMessages", out bool ingestAuditMessages))
+            {
+                // Backwards compatibility
+                var serviceControlNamespace = new SettingsRootNamespace("ServiceControl");
+                ingestAuditMessages = SettingsReader.Read(serviceControlNamespace, "IngestAuditMessages", true);
+            }
+
+            IngestAuditMessages = ingestAuditMessages;
 
             if (IngestAuditMessages == false)
             {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,14 @@ void LoadAuditQueueInformation()`
`64`	`64`	`throw new Exception("ServiceBus/AuditQueue value is required to start the instance");`
`65`	`65`	`}`
`66`	`66`
`67`		`- IngestAuditMessages = SettingsReader.Read(new SettingsRootNamespace("ServiceControl"), "IngestAuditMessages", true);`
	`67`	`+ if (!SettingsReader.TryRead(SettingsRootNamespace, "IngestAuditMessages", out bool ingestAuditMessages))`
	`68`	`+ {`
	`69`	`+ // Backwards compatibility`
	`70`	`+ var serviceControlNamespace = new SettingsRootNamespace("ServiceControl");`
	`71`	`+ ingestAuditMessages = SettingsReader.Read(serviceControlNamespace, "IngestAuditMessages", true);`
	`72`	`+ }`
	`73`	`+`
	`74`	`+ IngestAuditMessages = ingestAuditMessages;`
`68`	`75`
`69`	`76`	`if (IngestAuditMessages == false)`
`70`	`77`	`{`