Skip to content

Commit

Permalink
Ensure DisableInternalTcpTls has no effect
Browse files Browse the repository at this point in the history
  • Loading branch information
hayley-jean committed Aug 7, 2020
1 parent 22ec21b commit d59c1af
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/EventStore.ClusterNode/ClusterVNodeHostedService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ internal class ClusterVNodeHostedService : EventStoreHostedService<ClusterNodeOp

if (opts.DisableInternalTcpTls) {
Log.Warning(
$"\n DEPRECATION WARNING: The '{nameof(Options.DisableInternalTcpTls)}' option has been deprecated as of version 20.6.1. "
$"\n DEPRECATION WARNING: The '{nameof(Options.DisableInternalTcpTls)}' option has been deprecated as of version 20.6.1 and currently has no effect. "
+ $"Please use the '{nameof(Options.Insecure)}' option instead.\n");
}

Expand Down Expand Up @@ -199,7 +199,7 @@ internal class ClusterVNodeHostedService : EventStoreHostedService<ClusterNodeOp
private static ClusterVNode BuildNode(ClusterNodeOptions options, Func<ClusterNodeOptions> loadConfigFunc) {
var quorumSize = GetQuorumSize(options.ClusterSize);

var disableInternalTcpTls = options.Insecure || options.DisableInternalTcpTls;
var disableInternalTcpTls = options.Insecure;
var disableExternalTcpTls = options.Insecure || options.DisableExternalTcpTls;

var httpEndPoint = new IPEndPoint(options.ExtIp, options.HttpPort);
Expand Down Expand Up @@ -342,8 +342,6 @@ internal class ClusterVNodeHostedService : EventStoreHostedService<ClusterNodeOp
builder.DisableExternalTcpTls();
builder.DisableHttps();
}
if (options.DisableInternalTcpTls)
builder.DisableInternalTcpTls();
if (options.DisableExternalTcpTls)
builder.DisableExternalTcpTls();
if (options.EnableExternalTCP)
Expand Down

0 comments on commit d59c1af

Please sign in to comment.