Skip to content

Commit 017cf9b

Browse files
authored
Merge pull request #326 from scalecube/get-rid-of-host-from-transport-config
Removed `host` from TransportConfig
2 parents ffd7a28 + 9db58f6 commit 017cf9b

File tree

3 files changed

+10
-35
lines changed

3 files changed

+10
-35
lines changed

cluster/src/test/java/io/scalecube/cluster/ClusterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testStartStopRepeatedly() throws Exception {
4242
.gossip(opts -> opts.gossipInterval(100))
4343
.failureDetector(opts -> opts.pingInterval(100))
4444
.membership(opts -> opts.syncInterval(100))
45-
.transport(opts -> opts.host(address.host()).port(address.port()))
45+
.transport(opts -> opts.port(address.port()))
4646
.transport(opts -> opts.connectTimeout(CONNECT_TIMEOUT))
4747
.startAwait();
4848

@@ -67,7 +67,7 @@ public void testStartStopRepeatedly() throws Exception {
6767
.gossip(opts -> opts.gossipInterval(100))
6868
.failureDetector(opts -> opts.pingInterval(100))
6969
.membership(opts -> opts.syncInterval(100))
70-
.transport(opts -> opts.host(address.host()).port(address.port()))
70+
.transport(opts -> opts.port(address.port()))
7171
.transport(opts -> opts.connectTimeout(CONNECT_TIMEOUT))
7272
.startAwait();
7373

transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/TransportConfig.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public final class TransportConfig implements Cloneable {
1414
// Local cluster working via loopback interface (overrides default/LAN settings)
1515
public static final int DEFAULT_LOCAL_CONNECT_TIMEOUT = 1_000;
1616

17-
private String host = null;
1817
private int port = 0;
1918
private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
2019
private MessageCodec messageCodec = MessageCodec.INSTANCE;
@@ -50,23 +49,7 @@ public static TransportConfig defaultWanConfig() {
5049
* @return new {@code MembershipConfig}
5150
*/
5251
public static TransportConfig defaultLocalConfig() {
53-
return defaultConfig().connectTimeout(DEFAULT_LOCAL_CONNECT_TIMEOUT).host("localhost");
54-
}
55-
56-
public String host() {
57-
return host;
58-
}
59-
60-
/**
61-
* Sets a host.
62-
*
63-
* @param host host
64-
* @return new {@code TransportConfig} instance
65-
*/
66-
public TransportConfig host(String host) {
67-
TransportConfig t = clone();
68-
t.host = host;
69-
return t;
52+
return defaultConfig().connectTimeout(DEFAULT_LOCAL_CONNECT_TIMEOUT);
7053
}
7154

7255
public int port() {
@@ -145,7 +128,6 @@ public TransportConfig clone() {
145128
@Override
146129
public String toString() {
147130
return new StringJoiner(", ", TransportConfig.class.getSimpleName() + "[", "]")
148-
.add("host='" + host + "'")
149131
.add("port=" + port)
150132
.add("connectTimeout=" + connectTimeout)
151133
.add("messageCodec=" + messageCodec)

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/TransportImpl.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -334,20 +334,13 @@ private Mono<Void> shutdownLoopResources() {
334334
* @return tcp server
335335
*/
336336
private TcpServer newTcpServer() {
337-
TcpServer tcpServer =
338-
TcpServer.create()
339-
.runOn(loopResources)
340-
.option(ChannelOption.TCP_NODELAY, true)
341-
.option(ChannelOption.SO_KEEPALIVE, true)
342-
.option(ChannelOption.SO_REUSEADDR, true)
343-
.port(config.port());
344-
345-
if (config.host() != null) {
346-
tcpServer = tcpServer.host(config.host());
347-
}
348-
349-
return tcpServer.bootstrap(
350-
b -> BootstrapHandlers.updateConfiguration(b, "inbound", channelInitializer));
337+
return TcpServer.create()
338+
.runOn(loopResources)
339+
.option(ChannelOption.TCP_NODELAY, true)
340+
.option(ChannelOption.SO_KEEPALIVE, true)
341+
.option(ChannelOption.SO_REUSEADDR, true)
342+
.port(config.port())
343+
.bootstrap(b -> BootstrapHandlers.updateConfiguration(b, "inbound", channelInitializer));
351344
}
352345

353346
/**

0 commit comments

Comments
 (0)