提交线上使用版本HEADmaster

4 files changed, 34 insertions, 13 deletions

diff --git a/src/test/java/cn/ac/iie/test/LoggerTest.java b/src/test/java/cn/ac/iie/test/LoggerTest.java
new file mode 100644
index 0000000..71e6d2a
--- /dev/null
+++ b/src/test/java/cn/ac/iie/test/LoggerTest.java
@@ -0,0 +1,21 @@
+package cn.ac.iie.test;
+
+import cn.ac.iie.common.SubscriberConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoggerTest {
+    private static final Logger logger = LoggerFactory.getLogger(LoggerTest.class);
+
+    public static void main(String[] args) {
+        try{
+            int a = 1;
+            throw new Exception();
+        }catch (Exception e){
+            int b = 20;
+            logger.error("id is {} aaaaaaaaaa {}.",SubscriberConfig.KAFKA_TOPIC,b,e);
+        }
+
+
+    }
+}
diff --git a/src/test/java/cn/ac/iie/test/SubcribeIdBolt.java b/src/test/java/cn/ac/iie/test/SubcribeIdBolt.java
index add969a..d4051a3 100644
--- a/src/test/java/cn/ac/iie/test/SubcribeIdBolt.java
+++ b/src/test/java/cn/ac/iie/test/SubcribeIdBolt.java
@@ -1,6 +1,6 @@
 package cn.ac.iie.test;
 
-import cn.ac.iie.common.AddressConfig;
+import cn.ac.iie.common.SubscriberConfig;
 import cn.ac.iie.utils.TupleUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.zdjizhi.utils.StringUtil;
@@ -37,7 +37,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
         // 管理Hbase的配置信息
         Configuration configuration = HBaseConfiguration.create();
         // 设置zookeeper节点
-        configuration.set("hbase.zookeeper.quorum", AddressConfig.HBASE_ZOOKEEPER_SERVERS);
+        configuration.set("hbase.zookeeper.quorum", SubscriberConfig.HBASE_ZOOKEEPER_SERVERS);
         try {
             connection = ConnectionFactory.createConnection(configuration);
         } catch (IOException e) {
@@ -64,7 +64,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
                     String ip = jsonObject.getString("framed_ip");
                     String account = jsonObject.getString("account");
                     dataValidation(ip, account, putList);
-                    if (putList.size() == AddressConfig.LIST_SIZE_MAX) {
+                    if (putList.size() == SubscriberConfig.LIST_SIZE_MAX) {
                         insertData(putList);
                     }
                 }
@@ -79,7 +79,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>(16);
         conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,
-                AddressConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+                SubscriberConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 
@@ -93,7 +93,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
      */
     private static void getAll() {
         try {
-            Table table = connection.getTable(TableName.valueOf("sub:" + AddressConfig.HBASE_TABLE_NAME));
+            Table table = connection.getTable(TableName.valueOf("sub:" + SubscriberConfig.HBASE_TABLE_NAME));
             Scan scan2 = new Scan();
             ResultScanner scanner = table.getScanner(scan2);
             for (Result result : scanner) {
@@ -114,7 +114,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
     private static void insertData(List<Put> putList) {
         Table table = null;
         try {
-            table = connection.getTable(TableName.valueOf("sub:" + AddressConfig.HBASE_TABLE_NAME));
+            table = connection.getTable(TableName.valueOf("sub:" + SubscriberConfig.HBASE_TABLE_NAME));
             table.put(putList);
             logger.error("写入hbase数目：" + putList.size());
             putList.clear();
@@ -141,7 +141,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
     private static void dataValidation(String ip, String account, List<Put> putList) {
         if (StringUtil.isNotBlank(ip) && StringUtil.isNotBlank(account)) {
 //            String s = ip.split("\\.")[0];
-//            if (!AddressConfig.CHECK_IP_SCOPE.contains(s)) {
+//            if (!SubscriberConfig.CHECK_IP_SCOPE.contains(s)) {
                 if (subIdMap.containsKey(ip)) {
                     if (!subIdMap.get(ip).equals(account)) {
                         Put put = new Put(ip.getBytes());
diff --git a/src/test/java/cn/ac/iie/test/SubcribeIdBoltone.java b/src/test/java/cn/ac/iie/test/SubcribeIdBoltone.java
index 00b54a8..558a141 100644
--- a/src/test/java/cn/ac/iie/test/SubcribeIdBoltone.java
+++ b/src/test/java/cn/ac/iie/test/SubcribeIdBoltone.java
@@ -1,6 +1,6 @@
 package cn.ac.iie.test;
 
-import cn.ac.iie.common.AddressConfig;
+import cn.ac.iie.common.SubscriberConfig;
 import com.alibaba.fastjson.JSONObject;
 import com.zdjizhi.utils.StringUtil;
 import org.apache.hadoop.conf.Configuration;
@@ -35,7 +35,7 @@ public class SubcribeIdBoltone extends BaseBasicBolt {
         // 管理Hbase的配置信息
         Configuration configuration = HBaseConfiguration.create();
         // 设置zookeeper节点
-        configuration.set("hbase.zookeeper.quorum", AddressConfig.HBASE_ZOOKEEPER_SERVERS);
+        configuration.set("hbase.zookeeper.quorum", SubscriberConfig.HBASE_ZOOKEEPER_SERVERS);
         try {
             connection = ConnectionFactory.createConnection(configuration);
         } catch (IOException e) {
@@ -76,7 +76,7 @@ public class SubcribeIdBoltone extends BaseBasicBolt {
      */
     private static void getAll() {
         try {
-            Table table = connection.getTable(TableName.valueOf("sub:" + AddressConfig.HBASE_TABLE_NAME));
+            Table table = connection.getTable(TableName.valueOf("sub:" + SubscriberConfig.HBASE_TABLE_NAME));
             Scan scan2 = new Scan();
             ResultScanner scanner = table.getScanner(scan2);
             for (Result result : scanner) {
@@ -101,7 +101,7 @@ public class SubcribeIdBoltone extends BaseBasicBolt {
     private static void dataValidation(String ip, String account, BasicOutputCollector collector) {
         if (StringUtil.isNotBlank(ip) && StringUtil.isNotBlank(account)) {
 //            String s = ip.split("\\.")[0];
-//            if (!AddressConfig.CHECK_IP_SCOPE.contains(s)) {
+//            if (!SubscriberConfig.CHECK_IP_SCOPE.contains(s)) {
             if (subIdMap.containsKey(ip)) {
                 if (!subIdMap.get(ip).equals(account)) {
                     subIdMap.put(ip, account);
diff --git a/src/test/java/cn/ac/iie/test/subTest.java b/src/test/java/cn/ac/iie/test/subTest.java
index 468517a..b0a9814 100644
--- a/src/test/java/cn/ac/iie/test/subTest.java
+++ b/src/test/java/cn/ac/iie/test/subTest.java
@@ -1,6 +1,6 @@
 package cn.ac.iie.test;
 
-import cn.ac.iie.common.AddressConfig;
+import cn.ac.iie.common.SubscriberConfig;
 import com.zdjizhi.utils.StringUtil;
 
 public class subTest {
@@ -24,7 +24,7 @@ public class subTest {
     private static boolean dataValidation(String ip, String account) {
         if (StringUtil.isNotBlank(ip) && StringUtil.isNotBlank(account)) {
             String s = ip.split("\\.")[0];
-            return !AddressConfig.CHECK_IP_SCOPE.contains(s);
+            return !SubscriberConfig.CHECK_IP_SCOPE.contains(s);
         }
         return false;
     }