Rolled out installation across code base so that creation of queues w…

…ill be done at install time only.
bfcamara · Feb 4, 2011 · 31d2482 · 31d2482
1 parent 17646dc
commit 31d2482
Show file tree

Hide file tree

Showing 21 changed files with 243 additions and 99 deletions.
diff --git a/src/distributor/MsmqWorkerAvailabilityManager/Installer.cs b/src/distributor/MsmqWorkerAvailabilityManager/Installer.cs
@@ -0,0 +1,16 @@
+using System.Security.Principal;
+using NServiceBus.Installation;
+using NServiceBus.Utils;
+
+namespace MsmqWorkerAvailabilityManager
+{
+    class Installer : INeedToInstallSomething<NServiceBus.Installation.Environments.Windows>
+    {
+        public void Install(WindowsIdentity identity)
+        {
+            var m = NServiceBus.Configure.Instance.Builder.Build<MsmqWorkerAvailabilityManager>();
+
+            MsmqUtilities.CreateQueueIfNecessary(m.StorageQueue, identity.Name);
+        }
+    }
+}
diff --git a/src/distributor/MsmqWorkerAvailabilityManager/MsmqWorkerAvailabilityManager.cs b/src/distributor/MsmqWorkerAvailabilityManager/MsmqWorkerAvailabilityManager.cs
@@ -20,24 +20,8 @@ public class MsmqWorkerAvailabilityManager : IWorkerAvailabilityManager
 		/// <remarks>The queue provided must be transactional.</remarks>
         public string StorageQueue
         {
-            get { return s; }
-            set 
-            {
-                s = value;
-
-                MsmqUtilities.CreateQueueIfNecessary(value);
-
-                var path = MsmqUtilities.GetFullPath(value);
-
-                var q = new MessageQueue(path);
-
-                if (!q.Transactional)
-                    throw new Exception("Queue must be transactional.");
-
-                storageQueue = q;
-            }
+            get; set;
         }
-        private string s;
 
 	    /// <summary>
 		/// Removes all entries from the worker availability queue
@@ -90,11 +74,9 @@ public void Start()
 	    {
             var path = MsmqUtilities.GetFullPath(StorageQueue);
 
-            MsmqUtilities.CreateQueueIfNecessary(StorageQueue);
-
-            var q = new MessageQueue(path);
+            storageQueue = new MessageQueue(path);
 
-            if (!q.Transactional)
+            if (!storageQueue.Transactional)
                 throw new Exception("Queue must be transactional.");
 	    }
 

diff --git a/src/distributor/MsmqWorkerAvailabilityManager/MsmqWorkerAvailabilityManager.csproj b/src/distributor/MsmqWorkerAvailabilityManager/MsmqWorkerAvailabilityManager.csproj
@@ -14,7 +14,6 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
@@ -73,6 +72,7 @@
     <Compile Include="..\..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Installer.cs" />
     <Compile Include="MsmqWorkerAvailabilityManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/src/impl/faults/NServiceBus.Faults.Forwarder.Config/ConfigureFaultsForwarder.cs b/src/impl/faults/NServiceBus.Faults.Forwarder.Config/ConfigureFaultsForwarder.cs
@@ -21,8 +21,6 @@ public static class ConfigureFaultsForwarder
         /// <returns></returns>
         public static Configure MessageForwardingInCaseOfFault(this Configure config)
         {
-            string errorQueue;
-
             var section = Configure.GetConfigSection<MessageForwardingInCaseOfFaultConfig>();
             if (section == null)
             {
@@ -33,23 +31,25 @@ public static Configure MessageForwardingInCaseOfFault(this Configure config)
                     throw new ConfigurationErrorsException("Could not find backup configuration section 'MsmqTransportConfig' in order to locate the error queue.");
 
 
-                errorQueue = msmq.ErrorQueue;
+                ErrorQueue = msmq.ErrorQueue;
             }
             else
-                errorQueue = section.ErrorQueue;
+                ErrorQueue = section.ErrorQueue;
 
-			if(string.IsNullOrEmpty(errorQueue))
+			if(string.IsNullOrEmpty(ErrorQueue))
 				throw new ConfigurationErrorsException("Faults forwarding requires a error queue to be specified. Please add a 'MessageForwardingInCaseOfFaultConfig' section to your app.config");
 
-            //TODO: this should probably be moved to a new IManageFaults.Start|Init method instead. Check with Udi
-            MsmqUtilities.CreateQueueIfNecessary(errorQueue);
-
             config.Configurer.ConfigureComponent<FaultManager>(DependencyLifecycle.InstancePerCall)
-                .ConfigureProperty(fm => fm.ErrorQueue, errorQueue);
+                .ConfigureProperty(fm => fm.ErrorQueue, ErrorQueue);
 
             return config;
         }
 
+        /// <summary>
+        /// The queue to which to forward errors.
+        /// </summary>
+        public static string ErrorQueue { get; set; }
+
         private static ILog Logger = LogManager.GetLogger("MessageForwardingInCaseOfFault");
     }
 

diff --git a/src/impl/faults/NServiceBus.Faults.Forwarder.Config/Installer.cs b/src/impl/faults/NServiceBus.Faults.Forwarder.Config/Installer.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Principal;
+using System.Text;
+using NServiceBus.Installation;
+using NServiceBus.Utils;
+
+namespace NServiceBus.Faults.Forwarder.Config
+{
+    class Installer : INeedToInstallSomething<Installation.Environments.Windows>
+    {
+        public void Install(WindowsIdentity identity)
+        {
+            MsmqUtilities.CreateQueueIfNecessary(ConfigureFaultsForwarder.ErrorQueue, identity.Name);
+        }
+    }
+}
diff --git a/...mpl/faults/NServiceBus.Faults.Forwarder.Config/NServiceBus.Faults.Forwarder.Config.csproj b/...mpl/faults/NServiceBus.Faults.Forwarder.Config/NServiceBus.Faults.Forwarder.Config.csproj
@@ -65,6 +65,14 @@
       <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.Faults.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="NServiceBus.Installation">
+      <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.Installation.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Installation.Windows">
+      <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.Installation.Windows.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="NServiceBus.ObjectBuilder, Version=2.1.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.ObjectBuilder.dll</HintPath>
@@ -97,6 +105,7 @@
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="ConfigureFaultsForwarder.cs" />
+    <Compile Include="Installer.cs" />
     <Compile Include="MessageForwardingInCaseOfFaultConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/MsmqSubscriptionStorage.cs b/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/MsmqSubscriptionStorage.cs
@@ -35,6 +35,30 @@ public class MsmqSubscriptionStorage : ISubscriptionStorage
     {
         void ISubscriptionStorage.Init()
         {
+            string path = MsmqUtilities.GetFullPath(Queue);
+
+            q = new MessageQueue(path);
+
+            bool transactional;
+            try
+            {
+                transactional = q.Transactional;
+            }
+            catch (Exception ex)
+            {
+                throw new ArgumentException(string.Format("There is a problem with the subscription storage queue {0}. See enclosed exception for details.", Queue), ex);
+            }
+
+            if (!transactional)
+                throw new ArgumentException("Queue must be transactional (" + Queue + ").");
+
+            var mpf = new MessagePropertyFilter();
+            mpf.SetAll();
+
+            q.Formatter = new XmlMessageFormatter(new[] { typeof(string) });
+
+            q.MessageReadPropertyFilter = mpf;
+
             foreach (var m in q.GetAllMessages())
             {
                 var subscriber = m.Label;
@@ -168,38 +192,8 @@ private MessageQueueTransactionType GetTransactionType()
 		/// </summary>
         public string Queue
         {
-            get { return queue; }
-            set
-            {
-                queue = value;
-                MsmqUtilities.CreateQueueIfNecessary(value);
-
-                string path = MsmqUtilities.GetFullPath(value);
-
-                q = new MessageQueue(path);
-
-                bool transactional;
-                try
-                {
-                    transactional = q.Transactional;
-                }
-                catch(Exception ex)
-                {
-                    throw new ArgumentException(string.Format("There is a problem with the subscription storage queue {0}. See enclosed exception for details.", value), ex);
-                }
-
-                if (!transactional)
-                    throw new ArgumentException("Queue must be transactional (" + value + ").");
-
-                var mpf = new MessagePropertyFilter();
-                mpf.SetAll();
-
-                q.Formatter = new XmlMessageFormatter(new[] { typeof(string) });
-
-                q.MessageReadPropertyFilter = mpf;
-            }
+            get; set;
         }
-        private string queue;
 
         #endregion
 

diff --git a/...ns.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/ConfigureMsmqSubscriptionStorage.cs b/...ns.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/ConfigureMsmqSubscriptionStorage.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NServiceBus.Unicast.Subscriptions.Msmq.Config;
+using Common.Logging;
+using NServiceBus.Config;
+using NServiceBus.ObjectBuilder;
+using NServiceBus.Unicast.Subscriptions.Msmq;
 
 namespace NServiceBus
 {
@@ -19,12 +18,26 @@ public static class ConfigureMsmqSubscriptionStorage
         /// </summary>
         /// <param name="config"></param>
         /// <returns></returns>
-        public static ConfigMsmqSubscriptionStorage MsmqSubscriptionStorage(this Configure config)
+        public static Configure MsmqSubscriptionStorage(this Configure config)
         {
-            ConfigMsmqSubscriptionStorage cfg = new ConfigMsmqSubscriptionStorage();
-            cfg.Configure(config);
+            var cfg = Configure.GetConfigSection<MsmqSubscriptionStorageConfig>();
 
-            return cfg;
+            if (cfg == null)
+                Logger.Warn("Could not find configuration section for Msmq Subscription Storage.");
+
+            Queue = (cfg != null ? cfg.Queue : "NServiceBus_Subscriptions");
+
+            var storageConfig = config.Configurer.ConfigureComponent<MsmqSubscriptionStorage>(DependencyLifecycle.SingleInstance);
+            storageConfig.ConfigureProperty(s => s.Queue, Queue);
+
+            return config;
         }
+
+        /// <summary>
+        /// Queue used to store subscriptions.
+        /// </summary>
+        public static string Queue { get; set; }
+
+        private static readonly ILog Logger = LogManager.GetLogger(typeof(MsmqSubscriptionStorage));
     }
 }
diff --git a/...Bus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/Installer.cs b/...Bus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/Installer.cs
@@ -0,0 +1,21 @@
+using System.Security.Principal;
+using NServiceBus.Installation;
+using NServiceBus.Utils;
+
+namespace NServiceBus.Unicast.Subscriptions.Msmq.Config
+{
+    /// <summary>
+    /// Class responssible for installing the MSMQ subscription storage.
+    /// </summary>
+    public class Installer : INeedToInstallSomething<Installation.Environments.Windows>
+    {
+        /// <summary>
+        /// Installs the queue.
+        /// </summary>
+        /// <param name="identity"></param>
+        public void Install(WindowsIdentity identity)
+        {
+            MsmqUtilities.CreateQueueIfNecessary(ConfigureMsmqSubscriptionStorage.Queue, identity.Name);
+        }
+    }
+}
diff --git a/...us.Unicast.Subscriptions.Msmq.Config/NServiceBus.Unicast.Subscriptions.Msmq.Config.csproj b/...us.Unicast.Subscriptions.Msmq.Config/NServiceBus.Unicast.Subscriptions.Msmq.Config.csproj
@@ -63,6 +63,14 @@
       <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Config.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="NServiceBus.Installation">
+      <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Installation.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Installation.Windows">
+      <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Installation.Windows.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="NServiceBus.ObjectBuilder">
       <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.ObjectBuilder.dll</HintPath>
       <Private>False</Private>
@@ -71,6 +79,10 @@
       <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Unicast.Subscriptions.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="NServiceBus.Utils">
+      <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Utils.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
@@ -83,7 +95,7 @@
     <Compile Include="..\..\..\..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="ConfigMsmqSubscriptionStorage.cs" />
+    <Compile Include="Installer.cs" />
     <Compile Include="ConfigureMsmqSubscriptionStorage.cs" />
     <Compile Include="MsmqSubscriptionStorageConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/...impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/ConfigureMsmqMessageQueue.cs b/...impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/ConfigureMsmqMessageQueue.cs
@@ -6,13 +6,20 @@ namespace NServiceBus
 {
     public static class ConfigureMsmqMessageQueue
     {
+        /// <summary>
+        /// Indicates that MsmqMessageQueue has been selected.
+        /// </summary>
+        public static bool Selected { get; set; }
+
         /// <summary>
         /// Use MSMQ for your queuing infrastructure.
         /// </summary>
         /// <param name="config"></param>
         /// <returns></returns>
         public static Configure MsmqTransport(this Configure config)
         {
+            Selected = true;
+
             config.Configurer.ConfigureComponent<MsmqMessageReceiver>(DependencyLifecycle.SingleInstance);
             config.Configurer.ConfigureComponent<MsmqMessageSender>(DependencyLifecycle.SingleInstance);
 

diff --git a/src/impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/Installer.cs b/src/impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/Installer.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Principal;
+using System.Text;
+using NServiceBus.Installation;
+using NServiceBus.Utils;
+
+namespace NServiceBus.Unicast.Queuing.Msmq.Config
+{
+    class Installer : INeedToInstallSomething<Installation.Environments.Windows>
+    {
+        public void Install(WindowsIdentity identity)
+        {
+            if (!ConfigureMsmqMessageQueue.Selected)
+                return;
+
+            var bus = NServiceBus.Configure.Instance.Builder.Build<UnicastBus>();
+
+            MsmqUtilities.CreateQueueIfNecessary(bus.Address, identity.Name);
+        }
+    }
+}