diff --git a/hera-common/src/main/java/com/dfire/logs/ErrorLog.java b/hera-common/src/main/java/com/dfire/logs/ErrorLog.java index b9d1d935..d8b8d923 100755 --- a/hera-common/src/main/java/com/dfire/logs/ErrorLog.java +++ b/hera-common/src/main/java/com/dfire/logs/ErrorLog.java @@ -18,7 +18,7 @@ public class ErrorLog { log.error(format, arguments); } - public static void error(String msg, Exception e) { + public static void error(String msg, Throwable e) { log.error(msg, e); } diff --git a/hera-core/src/main/java/com/dfire/core/lock/DistributeLock.java b/hera-core/src/main/java/com/dfire/core/lock/DistributeLock.java index 5917ee95..31e19409 100755 --- a/hera-core/src/main/java/com/dfire/core/lock/DistributeLock.java +++ b/hera-core/src/main/java/com/dfire/core/lock/DistributeLock.java @@ -42,9 +42,6 @@ public class DistributeLock { @PostConstruct public void init() { - - - workClient.workSchedule.scheduleAtFixedRate(this::checkLock, 10, 60, TimeUnit.SECONDS); } @@ -66,8 +63,8 @@ public class DistributeLock { return; } } - - if (isMaster = WorkContext.host.equals(heraLock.getHost().trim())) { + isMaster = WorkContext.host.equals(heraLock.getHost().trim()); + if (isMaster) { heraLock.setServerUpdate(new Date()); heraLockService.update(heraLock); HeraLog.info("hold lock and update time"); diff --git a/hera-core/src/main/java/com/dfire/core/netty/master/MasterServer.java b/hera-core/src/main/java/com/dfire/core/netty/master/MasterServer.java index c18b7d43..2127dc01 100755 --- a/hera-core/src/main/java/com/dfire/core/netty/master/MasterServer.java +++ b/hera-core/src/main/java/com/dfire/core/netty/master/MasterServer.java @@ -43,7 +43,7 @@ public class MasterServer { //服务端接受客户端的连接, Reactor线程组 bossGroup = new NioEventLoopGroup(1); //SocketChannel的网络读写 - workGroup = new NioEventLoopGroup(1); + workGroup = new NioEventLoopGroup(4); this.handler = handler; serverBootstrap.group(bossGroup, workGroup) .channel(NioServerSocketChannel.class) diff --git a/hera-core/src/main/java/com/dfire/core/netty/worker/WorkHandler.java b/hera-core/src/main/java/com/dfire/core/netty/worker/WorkHandler.java index 74dccc56..1b91118b 100755 --- a/hera-core/src/main/java/com/dfire/core/netty/worker/WorkHandler.java +++ b/hera-core/src/main/java/com/dfire/core/netty/worker/WorkHandler.java @@ -19,6 +19,7 @@ import com.google.protobuf.InvalidProtocolBufferException; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.concurrent.*; @@ -171,7 +172,7 @@ public class WorkHandler extends SimpleChannelInboundHandler { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - ErrorLog.error("work exception: " + ctx.channel().remoteAddress(), cause.toString()); + ErrorLog.error("work exception: " + ctx.channel().remoteAddress(), cause); } private class ChannelResponse { diff --git a/hera-core/src/main/java/com/dfire/core/netty/worker/request/WorkerHandleWebRequest.java b/hera-core/src/main/java/com/dfire/core/netty/worker/request/WorkerHandleWebRequest.java index ef6e359d..6a3a82ab 100755 --- a/hera-core/src/main/java/com/dfire/core/netty/worker/request/WorkerHandleWebRequest.java +++ b/hera-core/src/main/java/com/dfire/core/netty/worker/request/WorkerHandleWebRequest.java @@ -85,6 +85,9 @@ public class WorkerHandleWebRequest { } private static Future buildMessage(WebRequest request, WorkContext workContext, String errorMsg) { + if (workContext.getServerChannel() == null) { + throw new RuntimeException("未连接到master节点,请确认master服务已启动。"); + } CountDownLatch latch = new CountDownLatch(1); WorkResponseListener responseListener = new WorkResponseListener(request, false, latch, null); workContext.getHandler().addListener(responseListener);