First instance of role will now listen to original queue when queuepe…

…rinstance is configured
bfcamara · Sep 27, 2011 · f8777c4 · f8777c4
1 parent dce5d55
commit f8777c4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/...eueing/NServiceBus.Unicast.Queuing.AppFabric.Config/IndividualQueueConfigurationSource.cs b/...eueing/NServiceBus.Unicast.Queuing.AppFabric.Config/IndividualQueueConfigurationSource.cs
@@ -15,13 +15,17 @@ public IndividualQueueConfigurationSource(IConfigurationSource innerSource)
         T IConfigurationSource.GetConfiguration<T>()
         {
             var config = innerSource.GetConfiguration<T>();
+            var index = 0;
+            if (RoleEnvironment.IsAvailable)
+                index = ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
 
             var unicastBusConfig = config as UnicastBusConfig;
             if (unicastBusConfig != null && unicastBusConfig.LocalAddress != null && RoleEnvironment.IsAvailable)
             {
-                var individualQueueName = ParseQueueNameFrom(unicastBusConfig.LocalAddress)
-                                          + "-"
-                                          + ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
+                var individualQueueName = ParseQueueNameFrom(unicastBusConfig.LocalAddress) 
+                                          + (index > 0 ? "-" : "")
+                                          + (index > 0 ? index.ToString() : "");
+
                 if (unicastBusConfig.LocalAddress.Contains("@"))
                     individualQueueName += "@" + ParseMachineNameFrom(unicastBusConfig.LocalAddress);
 
@@ -32,8 +36,9 @@ T IConfigurationSource.GetConfiguration<T>()
             if (msmqTransportConfig != null && msmqTransportConfig.InputQueue != null && RoleEnvironment.IsAvailable)
             {
                 var individualQueueName = ParseQueueNameFrom(msmqTransportConfig.InputQueue)
-                                          + "-"
-                                          + ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
+                                          + (index > 0 ? "-" : "")
+                                          + (index > 0 ? index.ToString() : "");
+
                 if (msmqTransportConfig.InputQueue.Contains("@"))
                     individualQueueName += "@" + ParseMachineNameFrom(msmqTransportConfig.InputQueue);
 

diff --git a/...e/Queueing/NServiceBus.Unicast.Queuing.Azure.Config/IndividualQueueConfigurationSource.cs b/...e/Queueing/NServiceBus.Unicast.Queuing.Azure.Config/IndividualQueueConfigurationSource.cs
@@ -15,13 +15,17 @@ public IndividualQueueConfigurationSource(IConfigurationSource innerSource)
         T IConfigurationSource.GetConfiguration<T>()
         {
             var config = innerSource.GetConfiguration<T>();
+            var index = 0;
+            if (RoleEnvironment.IsAvailable)
+                index = ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
 
             var unicastBusConfig = config as UnicastBusConfig;
             if (unicastBusConfig != null && unicastBusConfig.LocalAddress != null && RoleEnvironment.IsAvailable)
             {
                 var individualQueueName = ParseQueueNameFrom(unicastBusConfig.LocalAddress)
-                                          + "-"
-                                          + ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
+                                          + (index > 0 ? "-" : "")
+                                          + (index > 0 ? index.ToString() : "");
+
                 if (unicastBusConfig.LocalAddress.Contains("@"))
                     individualQueueName += "@" + ParseMachineNameFrom(unicastBusConfig.LocalAddress);
 
@@ -32,8 +36,9 @@ T IConfigurationSource.GetConfiguration<T>()
             if (msmqTransportConfig != null && msmqTransportConfig.InputQueue != null && RoleEnvironment.IsAvailable)
             {
                 var individualQueueName = ParseQueueNameFrom(msmqTransportConfig.InputQueue)
-                                          + "-"
-                                          + ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
+                                          + (index > 0 ? "-" : "")
+                                          + (index > 0 ? index.ToString() : "");
+
                 if (msmqTransportConfig.InputQueue.Contains("@"))
                     individualQueueName += "@" + ParseMachineNameFrom(msmqTransportConfig.InputQueue);