MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

perf: 优化代码

Browse Source
This commit is contained in:
叁只仓鼠
2022-10-30 02:50:59 +08:00
parent 46486af62e
commit 7153d2f1a7
7 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
View File

@@ -34,7 +34,7 @@ public class BallBukkitListener extends BallListener implements Listener {
}
@Override
public void onReconnectFailed() {
public void onServiceDead() {
Bukkit.shutdown();
}

2
hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java
View File

@@ -96,7 +96,7 @@ public final class BallBungeeCordListener extends BallListener implements Listen
}
@Override
public void onReconnectFailed() {
public void onServiceDead() {
ProxyServer.getInstance().stop("HamsterBall 重连失败.");
}

7
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
View File

@@ -129,11 +129,6 @@ public abstract class BallAPI {
BallServerInfo info = event.getServerInfo();
serverInfo.put(info.getId(), info);
}
@Override
public void onConnectInactive() {
reconnect(5);
}
});
}
@@ -258,7 +253,7 @@ public abstract class BallAPI {
if (ttl <= 0) {
for (BallListener listener : getListeners()) {
try {
listener.onReconnectFailed();
listener.onServiceDead();
} catch (Exception e) {
e.printStackTrace();
}

9
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java
View File

@@ -154,20 +154,13 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
@Override
public void channelActive(@NotNull ChannelHandlerContext context) {
BallAPI.getInstance().getLogger().warning("与服务器 " + context.channel().remoteAddress() + " 的连接已可用.");
BallAPI.getInstance().getLogger().info("与服务器 " + context.channel().remoteAddress() + " 建立了连接.");
}
@Override
public void channelInactive(@NotNull ChannelHandlerContext context) {
context.close();
BallAPI.getInstance().getLogger().warning("与服务器 " + context.channel().remoteAddress() + " 的连接已断开.");
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onConnectInactive();
} catch (Exception | Error e) {
e.printStackTrace();
}
}
BallAPI.getInstance().reconnect(5);
}

9
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java
View File

@@ -26,19 +26,14 @@ public final class BallDebugListener extends BallListener {
BallAPI.getInstance().getLogger().info("连接已可用。");
}
@Override
public void onConnectInactive() {
BallAPI.getInstance().getLogger().info("连接已中断！");
}
@Override
public void onConnectException(Throwable throwable) {
BallAPI.getInstance().getLogger().log(Level.INFO, "连接出现错误！", throwable);
}
@Override
public void onReconnectFailed() {
BallAPI.getInstance().getLogger().info("重新连接失败！");
public void onServiceDead() {
BallAPI.getInstance().getLogger().info("已无法建立与服务中心的连接！");
}
@Override

5
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
View File

@@ -26,13 +26,10 @@ public abstract class BallListener {
public void onMessageSend(@NotNull BallMessageInfo event) {
}
public void onConnectInactive() {
}
public void onConnectException(Throwable throwable) {
}
public void onReconnectFailed() {
public void onServiceDead() {
}
public void onBallPlayerPreLogin(@NotNull BallPlayerPreLoginEvent event) {

2
hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java
View File

@@ -36,7 +36,7 @@ public class BallServerChannelHandler extends SimpleChannelInboundHandler<String
@Override
public void channelActive(@NotNull ChannelHandlerContext context) {
LOGGER.warn("与服务器 {} 的连接已可用.", context.channel().remoteAddress());
LOGGER.info("与服务器 {} 建立了连接.", context.channel().remoteAddress());
}
@Override