1、启动日志修改

2、增加colletions4工具包 3、使用java8中的stream
mpusher · Sep 6, 2016 · c5784c4 · c5784c4
1 parent 705f9fa
commit c5784c4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/mpush-api/src/main/java/com/mpush/api/service/BaseService.java b/mpush-api/src/main/java/com/mpush/api/service/BaseService.java
@@ -47,7 +47,7 @@ protected void tryStart(Listener listener, Function function) {
             try {
                 init();
                 function.apply(listener);
-                listener.onSuccess("service " + this.getClass().getSimpleName() + " start success");
+                listener.onSuccess(String.format("service %s start success", this.getClass().getSimpleName()));
             } catch (Throwable e) {
                 listener.onFailure(e);
                 throw new ServiceException(e);
@@ -62,7 +62,7 @@ protected void tryStop(Listener listener, Function function) {
         if (started.compareAndSet(true, false)) {
             try {
                 function.apply(listener);
-                listener.onSuccess("service " + this.getClass().getSimpleName() + " stop success");
+                listener.onSuccess(String.format("service %s stop success", this.getClass().getSimpleName()));
             } catch (Throwable e) {
                 listener.onFailure(e);
                 throw new ServiceException(e);

diff --git a/mpush-boot/src/main/java/com/mpush/bootstrap/Main.java b/mpush-boot/src/main/java/com/mpush/bootstrap/Main.java
@@ -61,7 +61,7 @@ private void stop() {
             } catch (Exception e) {
                 Logs.Console.error("mpush server stop ex", e);
             }
-            Logs.Console.error("jvm exit, all server stopped...");
+            Logs.Console.info("jvm exit, all server stopped...");
         }
     }
 }
diff --git a/mpush-cache/src/main/java/com/mpush/cache/redis/manager/ZKRedisClusterManager.java b/mpush-cache/src/main/java/com/mpush/cache/redis/manager/ZKRedisClusterManager.java
@@ -19,7 +19,6 @@
 
 package com.mpush.cache.redis.manager;
 
-import com.google.common.collect.Lists;
 import com.mpush.cache.redis.RedisException;
 import com.mpush.cache.redis.RedisGroup;
 import com.mpush.cache.redis.RedisServer;
@@ -29,11 +28,13 @@
 import com.mpush.zk.ZKClient;
 import com.mpush.zk.listener.ZKRedisNodeWatcher;
 import com.mpush.zk.node.ZKRedisNode;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.mpush.zk.ZKPath.REDIS_SERVER;
 
@@ -54,20 +55,20 @@ public void init() {
         if (!ZKClient.I.isRunning()) throw new RedisException("init redis cluster ex, ZK client not running.");
         List<com.mpush.tools.config.data.RedisGroup> groupList = CC.mp.redis.cluster_group;
 
-        if (groupList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(groupList)) {
             register(groupList);
         }
 
         ZKRedisNodeWatcher watcher = new ZKRedisNodeWatcher();
         watcher.beginWatch();
         Collection<ZKRedisNode> nodes = watcher.getCache().values();
-        if (nodes == null || nodes.isEmpty()) {
-            Logs.REDIS.info("init redis client error, redis server is none.");
+        if (CollectionUtils.isEmpty(nodes)) {
+            Logs.REDIS.error("init redis client error, redis server is none.");
             throw new RedisException("init redis client error, redis server is none.");
         }
-        for (ZKRedisNode node : nodes) {
-            groups.add(RedisGroup.from(node));
-        }
+
+        nodes.stream().map(RedisGroup::from).forEach(groups::add);
+
         if (groups.isEmpty()) throw new RedisException("init redis sever fail groupList is null");
         Logs.Console.info("init redis cluster success...");
     }
@@ -104,12 +105,7 @@ public RedisServer randomGetRedisNode(String key) {
      */
     @Override
     public List<RedisServer> hashSet(String key) {
-        List<RedisServer> nodeList = Lists.newArrayList();
-        for (RedisGroup group : groups) {
-            RedisServer node = group.get(key);
-            nodeList.add(node);
-        }
-        return nodeList;
+        return groups.stream().map(g -> g.get(key)).collect(Collectors.toList());
     }
 
     private void register(List<com.mpush.tools.config.data.RedisGroup> groupList) {

diff --git a/mpush-test/src/test/resources/application.conf b/mpush-test/src/test/resources/application.conf
@@ -3,9 +3,9 @@ mp.log.level=debug
 mp.min-heartbeat=10s
 mp.max-heartbeat=10s
 mp.zk.namespace=mpush
-mp.zk.server-address="10.0.10.47:2181"
+mp.zk.server-address="10.199.241.96:2181"
 mp.core.compress-threshold=10k
 mp.redis {
     #redis 集群配置，group 是个二维数组，第一层表示有多少组集群，每个组下面可以有多台机器
-    cluster-group:[["10.0.10.53:6379:shinemo123"]]//格式是ip:port:password,密码可以没有ip:port
+    cluster-group:[["10.199.241.96:6379:test"]]//格式是ip:port:password,密码可以没有ip:port
 }
diff --git a/mpush-tools/pom.xml b/mpush-tools/pom.xml
@@ -76,5 +76,9 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -252,6 +252,12 @@
                 <version>4.10</version>
                 <scope>test</scope>
             </dependency>
+            <!-- collections -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>4.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>