Skip to content

Ensure graceful IConnection shutdown #38

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

Open
lsfera wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ensure graceful IConnection shutdown #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
803bc74
Remove netcoreapp2.0 - eol reached on 10/2018
Nov 14, 2020
f27f7ad
Add .net5.0 explicit support
Nov 14, 2020
15918e4
Allow graceful shutdown
Nov 17, 2020
528cffc
Bump version to 1.2.2
Nov 17, 2020
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
2 changes: 1 addition & 1 deletion src/Carrot.BasicSample/Carrot.BasicSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net461;net5.0</TargetFrameworks>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<StartupObject />
Expand Down
2 changes: 1 addition & 1 deletion src/Carrot.Benchmarks/Carrot.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<StartupObject />
Expand Down
2 changes: 1 addition & 1 deletion src/Carrot.NLog/Carrot.NLog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
<Description>a facility which enables NLog capabilities.</Description>
<Title>Carrot.NLog</Title>
<PackageId>Carrot.NLog</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/Carrot.RpcSample/Carrot.RpcSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<StartupObject />
Expand Down
2 changes: 1 addition & 1 deletion src/Carrot.Tests/Carrot.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Carrot.log4net/Carrot.log4net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
<Description>a facility which enables log4net capabilities.</Description>
<Title>Carrot.log4net</Title>
<PackageId>Carrot.log4net</PackageId>
Expand Down
14 changes: 7 additions & 7 deletions src/Carrot/Carrot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net461;net5.0</TargetFrameworks>
<Description>Carrot is a .NET lightweight library that provides a couple of facilities over RabbitMQ.</Description>
<Title>Carrot</Title>
<Title>Carrot</Title>
<PackageId>Carrot</PackageId>
<VersionPrefix>1.1.1</VersionPrefix>
<VersionSuffix></VersionSuffix>
<AssemblyVersion>1.2.1</AssemblyVersion>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.2</AssemblyVersion>
<FileVersion>1.2.2</FileVersion>
<NeutralLanguage>en</NeutralLanguage>
<Copyright>copyright © Nicola Baldi (naighes) 2019</Copyright>
<RepositoryUrl>https://github.com/naighes/Carrot.git</RepositoryUrl>
<PackageTags>rabbitmq</PackageTags>
<PackageReleaseNotes>
Requeue message if fallback fails.
</PackageReleaseNotes>
Enable graceful connection shutdown
</PackageReleaseNotes>
<PackageLicenseUrl>https://raw.githubusercontent.com/naighes/Carrot/master/LICENSE.txt</PackageLicenseUrl>
<Version>1.2.1</Version>
<Version>1.2.2</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion src/Carrot/Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public void Dispose()
consumer.Dispose();

_outboundChannel?.Dispose();
Cleanup(_connection, 200, "Connection Disposed");
_connection.ConnectionShutdown -= OnConnectionShutdown;
Cleanup(_connection, 200, "Connection Disposed");
_connection?.Dispose();
}

Expand Down
2 changes: 1 addition & 1 deletion src/Carrot/Serialization/JsonSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class JsonSerializer : ISerializer
public object Deserialize(ReadOnlyMemory<Byte> body, TypeInfo type, Encoding encoding = null)
{
var e = encoding ?? new UTF8Encoding(true);
#if NETCOREAPP3_1
#if (NETCOREAPP3_1 || NET5_0)

var json = e.GetString(body.Span);
#else
Expand Down