Skip to content

Fix mismatch between Client and Server queue names #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mythz merged 1 commit into from
Apr 25, 2018
Merged

Fix mismatch between Client and Server queue names #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/ServiceStack.Azure/Messaging/ServiceBusMqMessageFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ protected internal void StopQueues()

protected internal QueueClient GetOrCreateClient(string queueName)
{
if (queueName.StartsWith(QueueNames.MqPrefix))
queueName = queueName.ReplaceFirst(QueueNames.MqPrefix, "");

if (sbClients.ContainsKey(queueName))
return sbClients[queueName];

Expand Down
3 changes: 0 additions & 3 deletions src/ServiceStack.Azure/Messaging/ServiceBusMqMessageProducer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ public virtual void Publish(string queueName, IMessage message)
#if NETSTANDARD2_0
protected MessageReceiver GetOrCreateMessageReceiver(string queueName)
{
if (queueName.StartsWith(QueueNames.MqPrefix))
queueName = queueName.ReplaceFirst(QueueNames.MqPrefix, "");

if (sbReceivers.ContainsKey(queueName))
return sbReceivers[queueName];

Expand Down
8 changes: 5 additions & 3 deletions tests/ServiceStack.Azure.Tests/Messaging/MqServerAppHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ public abstract class MqServerAppHostTests
[OneTimeSetUp]
public void OneTimeSetUp()
{
QueueNames.MqPrefix = "mq."; // mq: is not valid in Azure Service Bus Queue Names

appHost = new MqTestsAppHost(() => CreateMqServer())
.Init()
.Start(ListeningOn);
Expand Down Expand Up @@ -363,7 +365,7 @@ public void Does_execute_ReplyTo_validation_filters()
{
var requestMsg = new Message<ValidateTestMq>(request)
{
ReplyTo = "mq:{0}.replyto".Fmt(request.GetType().Name)
ReplyTo = "{0}{1}.replyto".Fmt(QueueNames.MqPrefix, request.GetType().Name)
};
mqProducer.Publish(requestMsg);

Expand All @@ -375,7 +377,7 @@ public void Does_execute_ReplyTo_validation_filters()
request = new ValidateTestMq { Id = 10 };
requestMsg = new Message<ValidateTestMq>(request)
{
ReplyTo = "mq:{0}.replyto".Fmt(request.GetType().Name)
ReplyTo = "{0}{1}.replyto".Fmt(QueueNames.MqPrefix, request.GetType().Name)
};
mqProducer.Publish(requestMsg);
var responseMsg = mqClient.Get<ValidateTestMqResponse>(requestMsg.ReplyTo, null);
Expand All @@ -397,7 +399,7 @@ public void Does_handle_ReplyTo_generic_errors()
{
var requestMsg = new Message<ThrowGenericError>(request)
{
ReplyTo = "mq:{0}.replyto".Fmt(request.GetType().Name)
ReplyTo = "{0}{1}.replyto".Fmt(QueueNames.MqPrefix, request.GetType().Name)
};
mqProducer.Publish(requestMsg);

Expand Down