更新日志打印

2 files changed, 7 insertions, 9 deletions

diff --git a/src/main/java/cn/ac/iie/bolt/SubcribeIdBolt.java b/src/main/java/cn/ac/iie/bolt/SubcribeIdBolt.java
index d71542a..60bff8d 100644
--- a/src/main/java/cn/ac/iie/bolt/SubcribeIdBolt.java
+++ b/src/main/java/cn/ac/iie/bolt/SubcribeIdBolt.java
@@ -40,6 +40,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
         try {
             connection = ConnectionFactory.createConnection(configuration);
         } catch (IOException e) {
+            logger.error("连接HBase异常");
             e.printStackTrace();
         }
     }
@@ -60,8 +61,8 @@ public class SubcribeIdBolt extends BaseBasicBolt {
                 String message = tuple.getString(0);
                 if (StringUtil.isNotBlank(message)) {
                     JSONObject jsonObject = JSONObject.parseObject(message);
-                    String ip = jsonObject.getString("framed_ip");
-                    String account = jsonObject.getString("account");
+                    String ip = jsonObject.getString("radius_framed_ip");
+                    String account = jsonObject.getString("radius_account");
                     dataValidation(ip, account, putList);
                     if (putList.size() == AddressConfig.LIST_SIZE_MAX) {
                         insertData(putList);
@@ -69,7 +70,8 @@ public class SubcribeIdBolt extends BaseBasicBolt {
                 }
             }
         } catch (Exception e) {
-            logger.error("Radius写入Redis出现异常", e);
+            logger.error("Radius 日志解析/更新HBase 失败!");
+            e.printStackTrace();
         }
 
     }
@@ -103,6 +105,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
             }
             scanner.close();
         } catch (IOException e) {
+            logger.error("获取HBase所有rowkey出现异常");
             e.printStackTrace();
         }
     }
@@ -124,6 +127,7 @@ public class SubcribeIdBolt extends BaseBasicBolt {
                     table.close();
                 }
             } catch (IOException e) {
+                logger.error("更新数据写入HBase失败");
                 e.printStackTrace();
             }
         }
@@ -138,8 +142,6 @@ 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 (subIdMap.containsKey(ip)) {
                 if (!subIdMap.get(ip).equals(account)) {
                     Put put = new Put(ip.getBytes());
@@ -153,7 +155,6 @@ public class SubcribeIdBolt extends BaseBasicBolt {
                 putList.add(put);
                 subIdMap.put(ip, account);
             }
-//            }
         }
     }
 }
diff --git a/src/main/java/cn/ac/iie/topology/LogAddressRedisTopology.java b/src/main/java/cn/ac/iie/topology/LogAddressRedisTopology.java
index 491cc97..7632141 100644
--- a/src/main/java/cn/ac/iie/topology/LogAddressRedisTopology.java
+++ b/src/main/java/cn/ac/iie/topology/LogAddressRedisTopology.java
@@ -1,7 +1,6 @@
 package cn.ac.iie.topology;
 
 import cn.ac.iie.bolt.SubcribeIdBolt;
-import cn.ac.iie.bolt.ToHBaseBolt;
 import cn.ac.iie.common.AddressConfig;
 import cn.ac.iie.spout.CustomizedKafkaSpout;
 import org.apache.storm.Config;
@@ -57,8 +56,6 @@ public class LogAddressRedisTopology {
         builder = new TopologyBuilder();
         builder.setSpout("CustomizedKafkaSpout", new CustomizedKafkaSpout(), AddressConfig.SPOUT_PARALLELISM);
         builder.setBolt("SubcribeIdBolt", new SubcribeIdBolt(), AddressConfig.FORMAT_BOLT_PARALLELISM).localOrShuffleGrouping("CustomizedKafkaSpout");
-//        builder.setBolt("ToHBaseBolt", new ToHBaseBolt(), 1).localOrShuffleGrouping("SubcribeIdBolt");
-
     }
 
     public static void main(String[] args) throws Exception {