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

style: 优化日志格式

Browse Source
This commit is contained in:
叁只仓鼠
2023-11-03 17:11:39 +08:00
parent 0527101950
commit 2dc4e80cc0
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
View File

@@ -30,26 +30,26 @@ public class HamsterBallPlugin extends JavaPlugin {
public void onLoad() { public void onLoad() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger logger = getLogger(); Logger logger = getLogger();
logger.info("仓鼠球正在初始化..."); logger.info("仓鼠球正在初始化");
instance = this; instance = this;
saveDefaultConfig(); saveDefaultConfig();
reloadConfig(); reloadConfig();
logger.info("已读取配置文件."); logger.info("已读取配置文件");
try { try {
BallBukkitAPI.init(); BallBukkitAPI.init();
logger.info("已初始化 BallAPI."); logger.info("已初始化 BallAPI");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
logger.info("仓鼠球初始化完成，总计耗时 " + time + " ms."); logger.info("仓鼠球初始化完成，总计耗时 " + time + " ms");
} }
@Override @Override
public void onEnable() { public void onEnable() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger logger = getLogger(); Logger logger = getLogger();
logger.info("仓鼠球正在启动..."); logger.info("仓鼠球正在启动");
try { try {
BallBukkitAPI.getInstance().enable(); BallBukkitAPI.getInstance().enable();
} catch (Exception e) { } catch (Exception e) {
@@ -57,13 +57,13 @@ public class HamsterBallPlugin extends JavaPlugin {
} }
if (!BallAPI.getInstance().isEnabled()) { if (!BallAPI.getInstance().isEnabled()) {
sync(() -> { sync(() -> {
logger.info("由于 HamsterBall 未能成功连接, 服务器将立即关闭."); logger.info("由于 HamsterBall 未能成功连接, 服务器将立即关闭");
Bukkit.shutdown(); Bukkit.shutdown();
}); });
return; return;
} }
Bukkit.getPluginManager().registerEvents(BallBukkitListener.INSTANCE, this); Bukkit.getPluginManager().registerEvents(BallBukkitListener.INSTANCE, this);
logger.info("已注册 BallBukkitListener."); logger.info("已注册 BallBukkitListener");
BallAPI.getInstance().sendBallMessage( BallAPI.getInstance().sendBallMessage(
BallAPI.BALL_CHANNEL, BallAPI.BALL_CHANNEL,
ServerOnlineEvent.ACTION, ServerOnlineEvent.ACTION,
@@ -72,24 +72,24 @@ public class HamsterBallPlugin extends JavaPlugin {
sync(() -> { sync(() -> {
if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
PlaceholderHook.INSTANCE.register(); PlaceholderHook.INSTANCE.register();
logger.info("已挂载 PlaceholderAPI 变量!"); logger.info("已挂载 PlaceholderAPI 变量");
} }
}); });
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
logger.info("仓鼠球启动完成，总计耗时 " + time + " ms."); logger.info("仓鼠球启动完成，总计耗时 " + time + " ms");
} }
@Override @Override
public void onDisable() { public void onDisable() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger logger = getLogger(); Logger logger = getLogger();
logger.info("仓鼠球正在关闭..."); logger.info("仓鼠球正在关闭");
try { try {
BallBukkitAPI.getInstance().disable(); BallBukkitAPI.getInstance().disable();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
logger.info("仓鼠球已关闭，总计耗时 " + time + " ms."); logger.info("仓鼠球已关闭，总计耗时 " + time + " ms");
} }
} }

4
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
View File

@@ -49,10 +49,10 @@ public class BallBukkitAPI extends BallAPI {
DataSource datasource; DataSource datasource;
if (config.contains("datasource")) { if (config.contains("datasource")) {
plugin.getLogger().info("检测到配置文件中包含 datasource 节点，启用自定义数据库连接."); plugin.getLogger().info("检测到配置文件中包含 datasource 节点，启用自定义数据库连接");
datasource = BallBukkitUtils.getDataSource(config.getConfigurationSection("datasource")); datasource = BallBukkitUtils.getDataSource(config.getConfigurationSection("datasource"));
} else { } else {
plugin.getLogger().info("未检测到配置文件中的 datasource 节点，复用 HamsterCore 数据库连接."); plugin.getLogger().info("未检测到配置文件中的 datasource 节点，复用 HamsterCore 数据库连接");
datasource = CoreAPI.getInstance().getDataSource(); datasource = CoreAPI.getInstance().getDataSource();
} }

20
ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
View File

@@ -22,35 +22,35 @@ public class HamsterBallPlugin extends Plugin {
public void onLoad() { public void onLoad() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger logger = getLogger(); Logger logger = getLogger();
logger.info("仓鼠球正在初始化..."); logger.info("仓鼠球正在初始化");
instance = this; instance = this;
try { try {
BallBungeeCordAPI.init(); BallBungeeCordAPI.init();
logger.info("已初始化 BallAPI."); logger.info("已初始化 BallAPI");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
ProxyServer.getInstance().stop("由于 HamsterBall 未能成功连接, 服务器将立即关闭."); ProxyServer.getInstance().stop("由于 HamsterBall 未能成功连接, 服务器将立即关闭");
} }
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
logger.info("仓鼠球初始化完成，总计耗时 " + time + " ms."); logger.info("仓鼠球初始化完成，总计耗时 " + time + " ms");
} }
@Override @Override
public void onEnable() { public void onEnable() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger logger = getLogger(); Logger logger = getLogger();
logger.info("仓鼠球正在启动..."); logger.info("仓鼠球正在启动");
try { try {
BallBungeeCordAPI.getInstance().enable(); BallBungeeCordAPI.getInstance().enable();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
if (!BallAPI.getInstance().isEnabled()) { if (!BallAPI.getInstance().isEnabled()) {
ProxyServer.getInstance().stop("由于 HamsterBall 未能成功连接, 服务器将立即关闭."); ProxyServer.getInstance().stop("由于 HamsterBall 未能成功连接, 服务器将立即关闭");
return; return;
} }
ProxyServer.getInstance().getPluginManager().registerListener(this, BallBungeeCordListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerListener(this, BallBungeeCordListener.INSTANCE);
logger.info("已注册 BallBungeeCordListener."); logger.info("已注册 BallBungeeCordListener");
BallAPI.getInstance().sendBallMessage( BallAPI.getInstance().sendBallMessage(
BallAPI.BALL_CHANNEL, BallAPI.BALL_CHANNEL,
ServerOnlineEvent.ACTION, ServerOnlineEvent.ACTION,
@@ -66,20 +66,20 @@ public class HamsterBallPlugin extends Plugin {
}); });
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
logger.info("仓鼠球启动完成，总计耗时 " + time + " ms."); logger.info("仓鼠球启动完成，总计耗时 " + time + " ms");
} }
@Override @Override
public void onDisable() { public void onDisable() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger logger = getLogger(); Logger logger = getLogger();
logger.info("仓鼠球正在关闭..."); logger.info("仓鼠球正在关闭");
try { try {
BallBungeeCordAPI.getInstance().disable(); BallBungeeCordAPI.getInstance().disable();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
logger.info("仓鼠球已关闭，总计耗时 " + time + " ms."); logger.info("仓鼠球已关闭，总计耗时 " + time + " ms");
} }
} }

4
ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
View File

@@ -46,10 +46,10 @@ public class BallBungeeCordAPI extends BallAPI {
DataSource datasource; DataSource datasource;
if (config.contains("datasource")) { if (config.contains("datasource")) {
plugin.getLogger().info("检测到配置文件中包含 datasource 节点，启用自定义数据库连接."); plugin.getLogger().info("检测到配置文件中包含 datasource 节点，启用自定义数据库连接");
datasource = BallBungeeCordUtils.getDataSource(config.getSection("datasource")); datasource = BallBungeeCordUtils.getDataSource(config.getSection("datasource"));
} else { } else {
plugin.getLogger().info("未检测到配置文件中的 datasource 节点，复用 HamsterCore 数据库连接."); plugin.getLogger().info("未检测到配置文件中的 datasource 节点，复用 HamsterCore 数据库连接");
datasource = CoreAPI.getInstance().getDataSource(); datasource = CoreAPI.getInstance().getDataSource();
} }

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

@@ -84,7 +84,7 @@ public final class BallBungeeCordListener implements Listener, BallListener {
String serverID = event.getLocation().getServerID(); String serverID = event.getLocation().getServerID();
ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo(serverID); ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo(serverID);
if (serverInfo == null) { if (serverInfo == null) {
HamsterBallPlugin.getInstance().getLogger().warning("试图传送玩家时失败: 服务器 " + serverID + " 不在线!"); HamsterBallPlugin.getInstance().getLogger().warning("试图传送玩家时失败: 服务器 " + serverID + " 不在线");
break; break;
} }
for (UUID uuid : event.getSendPlayerUUID()) { for (UUID uuid : event.getSendPlayerUUID()) {
@@ -104,7 +104,7 @@ public final class BallBungeeCordListener implements Listener, BallListener {
UUID toPlayerUUID = event.getToPlayerUUID(); UUID toPlayerUUID = event.getToPlayerUUID();
ProxiedPlayer toPlayer = ProxyServer.getInstance().getPlayer(toPlayerUUID); ProxiedPlayer toPlayer = ProxyServer.getInstance().getPlayer(toPlayerUUID);
if (toPlayer == null) { if (toPlayer == null) {
HamsterBallPlugin.getInstance().getLogger().warning("试图传送玩家时失败: 目标玩家 " + toPlayerUUID + " 不在线!"); HamsterBallPlugin.getInstance().getLogger().warning("试图传送玩家时失败: 目标玩家 " + toPlayerUUID + " 不在线");
break; break;
} }
ServerInfo toServer = toPlayer.getServer().getInfo(); ServerInfo toServer = toPlayer.getServer().getInfo();

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

@@ -239,9 +239,9 @@ public abstract class BallAPI {
statement.executeUpdate(); statement.executeUpdate();
} }
} }
getLogger().info("正在关闭 redission..."); getLogger().info("正在关闭 redission");
getRedisClient().close(); getRedisClient().close();
getLogger().info("已关闭 redission."); getLogger().info("已关闭 redission");
} }
/** /**