GitHub-Mirror
/
Tapeti
mirror of
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag '1.3.2' into develop

This commit is contained in:
Mark van Renswoude 2019-08-08 11:56:26 +02:00
parent 263e364a84 53dc0b79f1
commit 70f394f7fe
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tapeti/Connection/TapetiWorker.cs
View File

@ -34,6 +34,7 @@ namespace Tapeti.Connection
// These fields are for use in the taskQueue only! // These fields are for use in the taskQueue only!
private RabbitMQ.Client.IConnection connection; private RabbitMQ.Client.IConnection connection;
private bool isClosing;
private bool isReconnect; private bool isReconnect;
private IModel channelInstance; private IModel channelInstance;
private ulong lastDeliveryTag; private ulong lastDeliveryTag;
@ -173,6 +174,8 @@ namespace Tapeti.Connection
return taskQueue.Value.Add(() => return taskQueue.Value.Add(() =>
{ {
isClosing = true;
if (channelInstance != null) if (channelInstance != null)
{ {
channelInstance.Dispose(); channelInstance.Dispose();
@ -371,6 +374,9 @@ namespace Tapeti.Connection
}); });
channelInstance = null; channelInstance = null;
if (!isClosing)
taskQueue.Value.Add(() => WithRetryableChannel(channel => { }));
}; };
channelInstance.BasicReturn += HandleBasicReturn; channelInstance.BasicReturn += HandleBasicReturn;