Merge pull request #1175 from Particular/hotfix-2.0.2

Hotfix 2.0.2
Particular · Jun 11, 2018 · 52b7946 · 52b7946
2 parents 187790d + 2ee8535
commit 52b7946
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModelValidator.cs b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModelValidator.cs
@@ -55,11 +55,11 @@ public ServiceControlAddViewModelValidator()
 
             RuleFor(x => x.ErrorQueueName)
                 .NotEmpty()
-                .NotEqual(x => x.AuditQueueName).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED, "Audit")
-                .NotEqual(x => x.ErrorForwardingQueueName).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED, "Error Forwarding")
-                .NotEqual(x => x.AuditForwardingQueueName).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED, "Audit Forwarding")
+                .NotEqual(x => x.AuditQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Audit")
+                .NotEqual(x => x.ErrorForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Error Forwarding")
+                .NotEqual(x => x.AuditForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Audit Forwarding")
                 .MustNotBeIn(x => UsedQueueNames(x.SelectedTransport, x.InstanceName, x.ConnectionString)).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED)
-                .When(x => x.SubmitAttempted);
+                .When(x => x.SubmitAttempted && x.ErrorQueueName != "!disable");
 
             RuleFor(x => x.ErrorForwardingQueueName)
                 .NotEmpty()
@@ -75,7 +75,7 @@ public ServiceControlAddViewModelValidator()
                 .NotEqual(x => x.ErrorForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Error Forwarding")
                 .NotEqual(x => x.AuditForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Audit Forwarding")
                 .MustNotBeIn(x => UsedQueueNames(x.SelectedTransport, x.InstanceName, x.ConnectionString)).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED)
-                .When(x => x.SubmitAttempted);
+                .When(x => x.SubmitAttempted && x.AuditQueueName != "!disable");
 
             RuleFor(x => x.AuditForwardingQueueName)
                 .NotEmpty()

diff --git a/src/ServiceControl.Config/UI/InstanceEdit/ServiceControlEditViewModelValidator.cs b/src/ServiceControl.Config/UI/InstanceEdit/ServiceControlEditViewModelValidator.cs
@@ -22,11 +22,11 @@ public ServiceControlEditViewModelValidator()
 
             RuleFor(x => x.ErrorQueueName)
                 .NotEmpty()
-                .NotEqual(x => x.AuditQueueName).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED, "Audit")
-                .NotEqual(x => x.ErrorForwardingQueueName).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED, "Error Forwarding")
-                .NotEqual(x => x.AuditForwardingQueueName).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED, "Audit Forwarding")
+                .NotEqual(x => x.AuditQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Audit")
+                .NotEqual(x => x.ErrorForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Error Forwarding")
+                .NotEqual(x => x.AuditForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Audit Forwarding")
                 .MustNotBeIn(x => UsedQueueNames(x.SelectedTransport, x.InstanceName, x.ConnectionString)).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED)
-                .When(x => x.SubmitAttempted);
+                .When(x => x.SubmitAttempted && x.ErrorQueueName != "!disable");
 
             RuleFor(x => x.ErrorForwardingQueueName)
                 .NotEmpty()
@@ -42,7 +42,7 @@ public ServiceControlEditViewModelValidator()
                 .NotEqual(x => x.ErrorForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Error Forwarding")
                 .NotEqual(x => x.AuditForwardingQueueName).WithMessage(Validations.MSG_UNIQUEQUEUENAME, "Audit Forwarding")
                 .MustNotBeIn(x => UsedQueueNames(x.SelectedTransport, x.InstanceName, x.ConnectionString)).WithMessage(Validations.MSG_QUEUE_ALREADY_ASSIGNED)
-                .When(x => x.SubmitAttempted);
+                .When(x => x.SubmitAttempted && x.AuditQueueName != "!disable");
 
             RuleFor(x => x.AuditForwardingQueueName)
                 .NotEmpty()

diff --git a/src/ServiceControlInstaller.Engine/Validation/ServiceControlQueueNameValidator.cs b/src/ServiceControlInstaller.Engine/Validation/ServiceControlQueueNameValidator.cs
@@ -87,7 +87,10 @@ void RunValidation()
 
         internal void CheckQueueNamesAreUniqueWithinInstance()
         {
-            if (queues.Select(p => p.QueueName.ToLower()).Distinct().Count() != queues.Count)
+            var duplicatedQueues = queues.ToLookup(x => x.QueueName.ToLower())
+                .Where(x => x.Key != "!disable" && x.Key != "!disable.log" && x.Count() > 1);
+
+            if (duplicatedQueues.Any())
             {
                 throw new EngineValidationException("Each of the queue names specified for a instance should be unique");
             }