Merge tag '1.3.2' into develop

This commit is contained in:
Mark van Renswoude 2019-08-08 11:56:26 +02:00
commit 70f394f7fe
1 changed files with 6 additions and 0 deletions

View File

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