diff --git a/src/main/java/com/qibaike/thriftnameserver/app/ThriftNameServer.java b/src/main/java/com/qibaike/thriftnameserver/app/ThriftNameServer.java index 14ca87d..9f595c0 100644 --- a/src/main/java/com/qibaike/thriftnameserver/app/ThriftNameServer.java +++ b/src/main/java/com/qibaike/thriftnameserver/app/ThriftNameServer.java @@ -4,8 +4,7 @@ import org.slf4j.LoggerFactory; import com.qibaike.thriftnameserver.conf.Config; -import com.qibaike.thriftnameserver.rpc.clusterConstants; -import com.qibaike.thriftnameserver.rpc.tnsrpcConstants; +import com.qibaike.thriftnameserver.rpc.structConstants; public class ThriftNameServer { public static void main(String[] args) { @@ -18,15 +17,14 @@ public static void main(String[] args) { * cluster rpc */ ClusterRpcServer clusterRpcServer = new ClusterRpcServer(); - clusterRpcServer.start(host, clusterConstants.PORT); - + clusterRpcServer.start(host, structConstants.PORT); + /** * tns rpc */ TNSRpcServer tnsRpcServer = new TNSRpcServer(); - tnsRpcServer.start(host, tnsrpcConstants.PORT); - - + tnsRpcServer.start(host, structConstants.PORT + 1); + SNodeManagerMBeanServer sNodeManagerMBeanServer = new SNodeManagerMBeanServer(); sNodeManagerMBeanServer.start(); diff --git a/src/main/java/com/qibaike/thriftnameserver/cluster/CNodeManager.java b/src/main/java/com/qibaike/thriftnameserver/cluster/CNodeManager.java index 7679ead..8bac666 100644 --- a/src/main/java/com/qibaike/thriftnameserver/cluster/CNodeManager.java +++ b/src/main/java/com/qibaike/thriftnameserver/cluster/CNodeManager.java @@ -15,7 +15,7 @@ import com.qibaike.thriftnameserver.rpc.Cluster; import com.qibaike.thriftnameserver.rpc.State; import com.qibaike.thriftnameserver.rpc.TCNode; -import com.qibaike.thriftnameserver.rpc.clusterConstants; +import com.qibaike.thriftnameserver.rpc.structConstants; public class CNodeManager implements CNodeManagerMBean { @@ -30,7 +30,7 @@ private CNodeManager() { TCNode me = new TCNode(); me.setHost(Config.HOSTNAME); - me.setPort(clusterConstants.PORT); + me.setPort(structConstants.PORT); me.setId(myId); me.setState(State.Joining); me.setTimestamp(System.currentTimeMillis()); @@ -124,7 +124,7 @@ private TCNode getOne(Long id) { @Override @Loggable public String meet(String host) { - TSocket transport = new TSocket(host, clusterConstants.PORT, 2000); + TSocket transport = new TSocket(host, structConstants.PORT, 2000); TProtocol protocol = new TBinaryProtocol(transport); Cluster.Client client = new Cluster.Client(protocol); try { diff --git a/src/main/java/com/qibaike/thriftnameserver/conf/Config.java b/src/main/java/com/qibaike/thriftnameserver/conf/Config.java index 8a5bdad..0d3e5f4 100644 --- a/src/main/java/com/qibaike/thriftnameserver/conf/Config.java +++ b/src/main/java/com/qibaike/thriftnameserver/conf/Config.java @@ -1,11 +1,11 @@ package com.qibaike.thriftnameserver.conf; -import com.qibaike.thriftnameserver.rpc.clusterConstants; +import com.qibaike.thriftnameserver.rpc.structConstants; public class Config { public static final String HOSTNAME = System.getProperty("hostname", "localhost"); - public static final Long TNSID = (long) (HOSTNAME+clusterConstants.PORT).hashCode(); - + public static final Long TNSID = (long) (HOSTNAME + structConstants.PORT).hashCode(); + public static final Long serviceRemoveSeconds = 60L; } diff --git a/src/main/java/com/qibaike/thriftnameserver/rpc/clusterConstants.java b/src/main/java/com/qibaike/thriftnameserver/rpc/structConstants.java similarity index 97% rename from src/main/java/com/qibaike/thriftnameserver/rpc/clusterConstants.java rename to src/main/java/com/qibaike/thriftnameserver/rpc/structConstants.java index fb28aa1..041a01f 100644 --- a/src/main/java/com/qibaike/thriftnameserver/rpc/clusterConstants.java +++ b/src/main/java/com/qibaike/thriftnameserver/rpc/structConstants.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -public class clusterConstants { +public class structConstants { public static final int PORT = 8700; diff --git a/src/main/java/com/qibaike/thriftnameserver/rpc/tnsrpcConstants.java b/src/main/java/com/qibaike/thriftnameserver/rpc/tnsrpcConstants.java deleted file mode 100644 index 3a017c9..0000000 --- a/src/main/java/com/qibaike/thriftnameserver/rpc/tnsrpcConstants.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Autogenerated by Thrift Compiler (0.9.2) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -package com.qibaike.thriftnameserver.rpc; - -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -public class tnsrpcConstants { - - public static final int PORT = 8701; - -} diff --git a/thrift/cluster.thrift b/thrift/cluster.thrift index fdf6a85..1a2e935 100755 --- a/thrift/cluster.thrift +++ b/thrift/cluster.thrift @@ -2,8 +2,6 @@ namespace java com.qibaike.thriftnameserver.rpc include "struct.thrift" -const i32 PORT = 8700 - service Cluster { /** diff --git a/thrift/struct.thrift b/thrift/struct.thrift index d769779..e3b9f69 100644 --- a/thrift/struct.thrift +++ b/thrift/struct.thrift @@ -1,5 +1,7 @@ namespace java com.qibaike.thriftnameserver.rpc +const i32 PORT = 8700 + enum State { UP = 1, DOWN = 2, diff --git a/thrift/tnsrpc.thrift b/thrift/tnsrpc.thrift index 721e1c5..320ec70 100755 --- a/thrift/tnsrpc.thrift +++ b/thrift/tnsrpc.thrift @@ -2,8 +2,6 @@ namespace java com.qibaike.thriftnameserver.rpc include "struct.thrift" -const i32 PORT = 8701 - service TNSRpc { /**