Skip to content

Enable automatic connection recovery by default #274

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
michaelklishin merged 1 commit into from
Oct 31, 2016
Merged

Enable automatic connection recovery by default #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,10 @@ public class ConnectionFactory : ConnectionFactoryBase, IConnectionFactory
public IList<AuthMechanismFactory> AuthMechanisms { get; set; } = DefaultAuthMechanisms;

/// <summary>
/// Set to true to enable automatic connection recovery.
/// Set to false to disable automatic connection recovery.
/// Defaults to true.
/// </summary>
public bool AutomaticRecoveryEnabled { get; set; }
public bool AutomaticRecoveryEnabled { get; set; } = true;

/// <summary>The host to connect to.</summary>
public string HostName { get; set; } = "localhost";
Expand Down Expand Up @@ -230,7 +231,8 @@ public TimeSpan ContinuationTimeout
public SslOption Ssl { get; set; } = new SslOption();

/// <summary>
/// Set to true to make automatic connection recovery also recover topology (exchanges, queues, bindings, etc).
/// Set to false to make automatic connection recovery not recover topology (exchanges, queues, bindings, etc).
/// Defaults to true.
/// </summary>
public bool TopologyRecoveryEnabled { get; set; } = true;

Expand Down
2 changes: 2 additions & 0 deletions projects/client/Unit/src/unit/Fixtures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ protected AutorecoveringConnection CreateAutorecoveringConnectionWithTopologyRec
protected IConnection CreateNonRecoveringConnection()
{
var cf = new ConnectionFactory();
cf.AutomaticRecoveryEnabled = false;
cf.TopologyRecoveryEnabled = false;
return cf.CreateConnection();
}

Expand Down
2 changes: 1 addition & 1 deletion projects/client/Unit/src/unit/TestChannelAllocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class TestIModelAllocation

public int ModelNumber(IModel model)
{
return ((ModelBase)model).Session.ChannelNumber;
return ((ModelBase)((AutorecoveringModel)model).Delegate).Session.ChannelNumber;
}

[SetUp] public void Connect()
Expand Down
2 changes: 1 addition & 1 deletion projects/client/Unit/src/unit/TestConnectionShutdown.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void TestShutdownSignalPropagationToChannels()
[Test]
public void TestConsumerDispatcherShutdown()
{
var m = (ModelBase)Model;
var m = (AutorecoveringModel)Model;
var latch = new ManualResetEvent(false);

this.Model.ModelShutdown += (model, args) =>
Expand Down
2 changes: 1 addition & 1 deletion projects/client/Unit/src/unit/TestModelShutdown.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ internal class TestModelShutdown : IntegrationFixture
[Test]
public void TestConsumerDispatcherShutdown()
{
var m = (ModelBase)Model;
var m = (AutorecoveringModel)Model;
var latch = new ManualResetEvent(false);

this.Model.ModelShutdown += (model, args) =>
Expand Down