Merge pull request #1184 from Particular/installers

Fix installers
Particular · Jun 13, 2018 · 16e9b26 · 16e9b26
2 parents b72cba9 + 42ed235
commit 16e9b26
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 27 deletions.
diff --git a/src/ServiceControl/Infrastructure/Installers/AuditLogQueueInstaller.cs b/src/ServiceControl/Infrastructure/Installers/AuditLogQueueInstaller.cs
diff --git a/src/ServiceControl/Infrastructure/Installers/AuditLoqQueue.cs b/src/ServiceControl/Infrastructure/Installers/AuditLoqQueue.cs
@@ -0,0 +1,25 @@
+namespace ServiceBus.Management.Infrastructure.Installers
+{
+    using NServiceBus.Features;
+    using NServiceBus.Transport;
+    using ServiceBus.Management.Infrastructure.Settings;
+
+    public class AuditLoqQueue : Feature
+    {
+        public AuditLoqQueue()
+        {
+            Prerequisite(c =>
+            {
+                var settings = c.Settings.Get<Settings>("ServiceControl.Settings");
+                return settings.ForwardAuditMessages && settings.AuditLogQueue != null;
+            }, "Audit Log queue not enabled.");
+        }
+
+        protected override void Setup(FeatureConfigurationContext context)
+        {
+            var settings = context.Settings.Get<Settings>("ServiceControl.Settings");
+            var queueBindings = context.Settings.Get<QueueBindings>();
+            queueBindings.BindSending(settings.AuditLogQueue);
+        }
+    }
+}
diff --git a/src/ServiceControl/Infrastructure/Installers/ErrorLogQueueInstaller.cs b/src/ServiceControl/Infrastructure/Installers/ErrorLogQueueInstaller.cs
@@ -1,18 +1,25 @@
 namespace ServiceBus.Management.Infrastructure.Installers
 {
-    using NServiceBus;
-    using NServiceBus.Unicast.Queuing;
+    using NServiceBus.Features;
+    using NServiceBus.Transport;
     using Settings;
 
-    public class ErrorLogQueueInstaller : IWantQueueCreated
+    public class ErrorLoqQueue : Feature
     {
-        public Settings Settings { get; set; }
-
-        public bool ShouldCreateQueue()
+        public ErrorLoqQueue()
         {
-            return Settings.ForwardErrorMessages && Settings.ErrorLogQueue != Address.Undefined;
+            Prerequisite(c =>
+            {
+                var settings = c.Settings.Get<Settings>("ServiceControl.Settings");
+                return settings.ForwardErrorMessages && settings.ErrorLogQueue != null;
+            }, "Error Log queue not enabled.");
         }
 
-        public Address Address => Settings.ErrorLogQueue;
+        protected override void Setup(FeatureConfigurationContext context)
+        {
+            var settings = context.Settings.Get<Settings>("ServiceControl.Settings");
+            var queueBindings = context.Settings.Get<QueueBindings>();
+            queueBindings.BindSending(settings.ErrorLogQueue);
+        }
     }
 }
diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
@@ -322,6 +322,7 @@
     <Compile Include="Infrastructure\DomainEvents\IDomainEvent.cs" />
     <Compile Include="Infrastructure\DomainEvents\IDomainEvents.cs" />
     <Compile Include="Infrastructure\DomainEvents\IDomainHandler.cs" />
+    <Compile Include="Infrastructure\Installers\AuditLoqQueue.cs" />
     <Compile Include="Infrastructure\MarkerFile.cs" />
     <Compile Include="Infrastructure\RavenDB\Extensions.cs" />
     <Compile Include="Infrastructure\RavenDB\Subscriptions\LegacyAddress.cs" />
@@ -517,7 +518,6 @@
     <Compile Include="EventLog\EventLogItem.cs" />
     <Compile Include="HeartbeatMonitoring\RegisterEndpointStartupHandler.cs" />
     <Compile Include="Infrastructure\DeterministicGuid.cs" />
-    <Compile Include="Infrastructure\Installers\AuditLogQueueInstaller.cs" />
     <Compile Include="Infrastructure\Installers\CreateEventSource.cs" />
     <Compile Include="Infrastructure\Plugins\RegisterPluginMessages.cs" />
     <Compile Include="Infrastructure\RavenDB\Expiration\ExpiredDocumentsCleanerBundle.cs" />