Skip to content

Allow setting heartbeat timeout to TimeSpan.Zero #1773

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
merged 3 commits into from
Jan 30, 2025
+24 −4
Merged

Allow setting heartbeat timeout to TimeSpan.Zero #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c6fda8
Improve error when disabling heartbeat
lukebakken Jan 23, 2025
276c9a6
Allow setting TimeSpan.Zero as a heartbeat timeout value
lukebakken Jan 24, 2025
2cb90b5
Add assertion that actual heartbeat timeout has been updated with the…
lukebakken Jan 24, 2025
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
14 changes: 10 additions & 4 deletions projects/RabbitMQ.Client/Impl/SocketFrameHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,11 @@ public TimeSpan ReadTimeout
{
try
{
_socket.ReceiveTimeout = value;
_stream.ReadTimeout = (int)value.TotalMilliseconds;
if (value != default)
{
_socket.ReceiveTimeout = value;
_stream.ReadTimeout = (int)value.TotalMilliseconds;
}
}
catch (SocketException)
{
Expand All @@ -125,8 +128,11 @@ public TimeSpan WriteTimeout
{
set
{
_socket.Client.SendTimeout = (int)value.TotalMilliseconds;
_stream.WriteTimeout = (int)value.TotalMilliseconds;
if (value != default)
{
_socket.Client.SendTimeout = (int)value.TotalMilliseconds;
_stream.WriteTimeout = (int)value.TotalMilliseconds;
}
}
}

Expand Down
14 changes: 14 additions & 0 deletions projects/Test/Integration/GH/TestGitHubIssues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,19 @@ public async Task TestBasicConsumeCancellation_GH1750()

Assert.False(sawConnectionShutdown);
}

[Fact]
public async Task TestHeartbeatTimeoutValue_GH1756()
{
var connectionFactory = new ConnectionFactory
{
AutomaticRecoveryEnabled = true,
RequestedHeartbeat = TimeSpan.Zero,
};

_conn = await connectionFactory.CreateConnectionAsync("some-name");

Assert.True(_conn.Heartbeat != default);
}
}
}
Loading