mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 13:21:21 +02:00
Code Issues Projects Releases Wiki Activity

Added NettyMessagingService constructor that accepts both ip and port

Browse Source
This commit is contained in:
Madan Jampani 2014-10-21 16:46:12 -07:00
parent 61d59dac06
commit 871009392c
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java vendored
View File

@ -67,7 +67,7 @@ public class ClusterCommunicationManager
@Activate
public void activate() {
ControllerNode localNode = clusterService.getLocalNode();
NettyMessagingService netty = new NettyMessagingService(localNode.tcpPort());
NettyMessagingService netty = new NettyMessagingService(localNode.ip().toString(), localNode.tcpPort());
// FIXME: workaround until it becomes a service.
try {
netty.activate();

3
utils/netty/src/main/java/org/onlab/netty/InternalMessage.java
View File

@ -44,8 +44,7 @@ public final class InternalMessage implements Message {
public void respond(byte[] data) throws IOException {
Builder builder = new Builder(messagingService);
InternalMessage message = builder.withId(this.id)
// FIXME: Sender should be messagingService.localEp.
.withSender(this.sender)
.withSender(messagingService.localEp())
.withPayload(data)
.withType(REPLY_MESSAGE_TYPE)
.build();

18
utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
View File

@ -42,7 +42,6 @@ public class NettyMessagingService implements MessagingService {
private final Logger log = LoggerFactory.getLogger(getClass());
private final int port;
private final Endpoint localEp;
private final ConcurrentMap<String, MessageHandler> handlers = new ConcurrentHashMap<>();
private final Cache<Long, AsyncResponse> responseFutures = CacheBuilder.newBuilder()
@ -77,6 +76,10 @@ public class NettyMessagingService implements MessagingService {
clientChannelClass = NioSocketChannel.class;
}
public NettyMessagingService(String ip, int port) {
localEp = new Endpoint(ip, port);
}
public NettyMessagingService() {
// TODO: Default port should be configurable.
this(8080);
@ -84,7 +87,6 @@ public class NettyMessagingService implements MessagingService {
// FIXME: Constructor should not throw exceptions.
public NettyMessagingService(int port) {
this.port = port;
try {
localEp = new Endpoint(java.net.InetAddress.getLocalHost().getHostName(), port);
} catch (UnknownHostException e) {
@ -106,6 +108,14 @@ public class NettyMessagingService implements MessagingService {
clientGroup.shutdownGracefully();
}
/**
* Returns the local endpoint for this instance.
* @return local end point.
*/
public Endpoint localEp() {
return localEp;
}
@Override
public void sendAsync(Endpoint ep, String type, byte[] payload) throws IOException {
InternalMessage message = new InternalMessage.Builder(this)
@ -127,7 +137,7 @@ public class NettyMessagingService implements MessagingService {
channels.returnObject(ep, channel);
}
} catch (Exception e) {
throw new IOException(e);
throw new IOException("Failed to send message to " + ep.toString(), e);
}
}
@ -174,7 +184,7 @@ public class NettyMessagingService implements MessagingService {
.childOption(ChannelOption.SO_KEEPALIVE, true);
// Bind and start to accept incoming connections.
b.bind(port).sync();
b.bind(localEp.port()).sync();
}
private class OnosCommunicationChannelFactory