Let error in normal situation

GrumpyBusted · GrumpyBusted · commit 6ce4c1e86b6c · 2018-02-04T10:17:12.000+01:00
diff --git a/Grumpy.MessageQueue.Msmq/MessageQueueManager.cs b/Grumpy.MessageQueue.Msmq/MessageQueueManager.cs
@@ -28,7 +28,7 @@ public MessageQueueManager(ILogger logger)
         }
 
         private const string PrivatePrefix = @"private$\";
-        private string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "" : $"FormatName:DIRECT=OS:") + Name(name, privateQueue);
+        private string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "" : "FormatName:DIRECT=OS:") + Name(name, privateQueue);
 
         private string Name(string name, bool privateQueue)
         {
diff --git a/Grumpy.MessageQueue.Msmq/Queue.cs b/Grumpy.MessageQueue.Msmq/Queue.cs
@@ -335,6 +335,13 @@ public async Task<ITransactionalMessage> ReceiveAsync(int millisecondsTimeout, C
             }
             catch (Exception exception)
             {
+                if (exception is TaskCanceledException taskCanceledException)
+                {
+                    Logger.Warning(taskCanceledException, "Receive canceled {@Queue}", this);
+
+                    return new TransactionalMessage();
+                }
+
                 Logger.Warning(exception, "Error receiving message, retrying once {@Queue}", this);
 
                 DisconnectInternal();

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public MessageQueueManager(ILogger logger)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private const string PrivatePrefix = @"private$\";`
`31`		`- private string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "" : $"FormatName:DIRECT=OS:") + Name(name, privateQueue);`
	`31`	`+ private string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "" : "FormatName:DIRECT=OS:") + Name(name, privateQueue);`
`32`	`32`
`33`	`33`	`private string Name(string name, bool privateQueue)`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,13 @@ public async Task<ITransactionalMessage> ReceiveAsync(int millisecondsTimeout, C`
`335`	`335`	`}`
`336`	`336`	`catch (Exception exception)`
`337`	`337`	`{`
	`338`	`+ if (exception is TaskCanceledException taskCanceledException)`
	`339`	`+ {`
	`340`	`+ Logger.Warning(taskCanceledException, "Receive canceled {@Queue}", this);`
	`341`	`+`
	`342`	`+ return new TransactionalMessage();`
	`343`	`+ }`
	`344`	`+`
`338`	`345`	`Logger.Warning(exception, "Error receiving message, retrying once {@Queue}", this);`
`339`	`346`
`340`	`347`	`DisconnectInternal();`