代码优化，抽离部分通用代码

mpusher · Jun 9, 2018 · ca290d2 · ca290d2
1 parent 0c2fa13
commit ca290d2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/mpush-netty/src/main/java/com/mpush/netty/client/NettyTCPClient.java b/mpush-netty/src/main/java/com/mpush/netty/client/NettyTCPClient.java
@@ -24,14 +24,12 @@
 import com.mpush.api.service.Listener;
 import com.mpush.netty.codec.PacketDecoder;
 import com.mpush.netty.codec.PacketEncoder;
-import com.mpush.tools.config.CC;
 import com.mpush.tools.thread.ThreadNames;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.*;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.epoll.EpollSocketChannel;
-import io.netty.channel.epoll.Native;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.concurrent.DefaultThreadFactory;
@@ -41,6 +39,8 @@
 import java.net.InetSocketAddress;
 import java.nio.channels.spi.SelectorProvider;
 
+import static com.mpush.tools.Utils.useNettyEpoll;
+
 public abstract class NettyTCPClient extends BaseService implements Client {
     private static final Logger LOGGER = LoggerFactory.getLogger(NettyTCPClient.class);
 
@@ -129,18 +129,6 @@ protected void doStart(Listener listener) throws Throwable {
         }
     }
 
-    private boolean useNettyEpoll() {
-        if (CC.mp.core.useNettyEpoll()) {
-            try {
-                Native.offsetofEpollData();
-                return true;
-            } catch (UnsatisfiedLinkError error) {
-                LOGGER.warn("can not load netty epoll, switch nio model.");
-            }
-        }
-        return false;
-    }
-
     @Override
     protected void doStop(Listener listener) throws Throwable {
         if (workerGroup != null) {

diff --git a/mpush-netty/src/main/java/com/mpush/netty/server/NettyTCPServer.java b/mpush-netty/src/main/java/com/mpush/netty/server/NettyTCPServer.java
@@ -26,14 +26,12 @@
 import com.mpush.netty.codec.PacketDecoder;
 import com.mpush.netty.codec.PacketEncoder;
 import com.mpush.tools.common.Strings;
-import com.mpush.tools.config.CC;
 import com.mpush.tools.thread.ThreadNames;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.*;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.epoll.EpollServerSocketChannel;
-import io.netty.channel.epoll.Native;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.util.concurrent.DefaultThreadFactory;
@@ -45,6 +43,8 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.mpush.tools.Utils.useNettyEpoll;
+
 /**
  * Created by ohun on 2015/12/22.
  *
@@ -302,18 +302,6 @@ protected int getIoRate() {
         return 70;
     }
 
-    protected boolean useNettyEpoll() {
-        if (CC.mp.core.useNettyEpoll()) {
-            try {
-                Native.offsetofEpollData();
-                return true;
-            } catch (UnsatisfiedLinkError error) {
-                logger.warn("can not load netty epoll, switch nio model.");
-            }
-        }
-        return false;
-    }
-
     public EventLoopGroup getBossGroup() {
         return bossGroup;
     }

diff --git a/mpush-tools/src/main/java/com/mpush/tools/Utils.java b/mpush-tools/src/main/java/com/mpush/tools/Utils.java
@@ -19,6 +19,7 @@
 
 package com.mpush.tools;
 
+import com.mpush.tools.config.CC;
 import com.mpush.tools.thread.NamedThreadFactory;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.SingleThreadEventLoop;
@@ -55,6 +56,18 @@ public static Thread newThread(String name, Runnable target) {
         return NAMED_THREAD_FACTORY.newThread(name, target);
     }
 
+    public static boolean useNettyEpoll() {
+        if (CC.mp.core.useNettyEpoll()) {
+            try {
+                Class.forName("io.netty.channel.epoll.Native");
+                return true;
+            } catch (Throwable error) {
+                LOGGER.warn("can not load netty epoll, switch nio model.");
+            }
+        }
+        return false;
+    }
+
     public static boolean isLocalHost(String host) {
         return host == null
                 || host.length() == 0
@@ -118,7 +131,7 @@ public static String getInetAddress(boolean getLocal) {
                             return address.getHostAddress();
                         }
                     } else {
-                        if (!address.isSiteLocalAddress() && !address.isLoopbackAddress()) {
+                        if (!address.isSiteLocalAddress()) {
                             return address.getHostAddress();
                         }
                     }