From edade2488339c31de2ff45f5839950c1513ae4d8 Mon Sep 17 00:00:00 2001 From: LamGC Date: Wed, 6 May 2020 09:34:28 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20Issue=20#2=20=E8=B0=83=E6=95=B4Logge?= =?UTF-8?q?r=20Name=E4=BB=A5=E7=BB=9F=E4=B8=80Logger=20Name=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/lamgc/cgj/Main.java | 2 +- .../java/net/lamgc/cgj/bot/BotAdminCommandProcess.java | 2 +- src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java | 2 +- .../net/lamgc/cgj/bot/MessageEventExecutionDebugger.java | 4 +--- .../java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java | 2 +- .../net/lamgc/cgj/bot/RandomRankingArtworksSender.java | 2 +- .../java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java | 2 +- .../java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java | 2 +- .../java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java | 2 +- src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java | 2 +- .../net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java | 2 +- .../java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java | 2 +- .../bot/framework/mirai/message/MiraiMessageSender.java | 2 +- src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java | 2 +- src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java | 2 +- .../java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java | 2 +- src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java | 7 +++---- 17 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java index b2d91b8..a1487b6 100644 --- a/src/main/java/net/lamgc/cgj/Main.java +++ b/src/main/java/net/lamgc/cgj/Main.java @@ -42,7 +42,7 @@ import java.util.zip.ZipOutputStream; @SpringBootApplication public class Main { - private final static Logger log = LoggerFactory.getLogger("Main"); + private final static Logger log = LoggerFactory.getLogger(Main.class.getName()); private final static File storeDir = new File("store/"); diff --git a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java index df660a1..2d3f30e 100644 --- a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java +++ b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java @@ -20,7 +20,7 @@ import java.util.*; public class BotAdminCommandProcess { - private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getSimpleName()); + private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getName()); private final static File globalPropFile = new File(System.getProperty("cgj.botDataDir"), "global.properties"); diff --git a/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java b/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java index fb4f216..d236cfa 100644 --- a/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java +++ b/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java @@ -40,7 +40,7 @@ public class BotCommandProcess { private final static PixivDownload pixivDownload = new PixivDownload(Main.cookieStore, Main.proxy); - private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getSimpleName()); + private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getName()); private final static File imageStoreDir = new File(System.getProperty("cgj.botDataDir"), "data/image/cgj/"); public final static Properties globalProp = new Properties(); diff --git a/src/main/java/net/lamgc/cgj/bot/MessageEventExecutionDebugger.java b/src/main/java/net/lamgc/cgj/bot/MessageEventExecutionDebugger.java index 1ce2976..e72ef5b 100644 --- a/src/main/java/net/lamgc/cgj/bot/MessageEventExecutionDebugger.java +++ b/src/main/java/net/lamgc/cgj/bot/MessageEventExecutionDebugger.java @@ -52,8 +52,6 @@ public enum MessageEventExecutionDebugger { } }); - public final static String debuggerLoggerNameTemp = "MessageEventExecuteDebugger-{debugger}"; - public final MessageExecuteDebugger debugger; MessageEventExecutionDebugger(MessageExecuteDebugger debugger) { @@ -61,7 +59,7 @@ public enum MessageEventExecutionDebugger { } public static Logger getDebuggerLogger(MessageEventExecutionDebugger debugger) { - return LoggerFactory.getLogger(debuggerLoggerNameTemp.replace("{debugger}", debugger.name())); + return LoggerFactory.getLogger(MessageEventExecutionDebugger.class.getName() + "." + debugger.name()); } @FunctionalInterface diff --git a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java index 53e7e32..897a8fe 100644 --- a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java +++ b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class RandomIntervalSendTimer extends TimerTask { private final static Timer timer = new Timer("Thread-RIST"); - private final static Logger log = LoggerFactory.getLogger("RandomIntervalSendTimer"); + private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class.getName()); private final static Map timerMap = new HashMap<>(); private final long timerId; diff --git a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java index 4335f0a..9b5ad0a 100644 --- a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java +++ b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java @@ -39,7 +39,7 @@ public class RandomRankingArtworksSender extends AutoSender { super(messageSender); this.mode = mode; this.contentType = contentType; - log = LoggerFactory.getLogger("RecommendArtworksSender@" + Integer.toHexString(this.hashCode())); + log = LoggerFactory.getLogger(this.toString()); this.rankingStart = rankingStart > 0 ? rankingStart : 1; this.rankingStop = rankingStop > 0 ? rankingStop : 150; if(this.rankingStart > this.rankingStop) { diff --git a/src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java b/src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java index e2d24eb..a0cdf2e 100644 --- a/src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java +++ b/src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java @@ -17,7 +17,7 @@ public class HotDataCacheStore implements CacheStore { private final long expireTime; private final int expireFloatRange; private final Random random = new Random(); - private final Logger log = LoggerFactory.getLogger(HotDataCacheStore.class.getSimpleName() + "@" + Integer.toHexString(this.hashCode())); + private final Logger log = LoggerFactory.getLogger(this.toString()); /** * 构造热点缓存存储对象 diff --git a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java index 9113386..e76e6e2 100644 --- a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java +++ b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java @@ -21,7 +21,7 @@ import java.util.Set; public class ImageCacheHandler implements EventHandler { - private final static Logger log = LoggerFactory.getLogger("ImageCacheHandler"); + private final static Logger log = LoggerFactory.getLogger(ImageCacheHandler.class.getName()); private final static HttpClient httpClient = HttpClientBuilder.create().setProxy(Main.proxy).build(); diff --git a/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java b/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java index 8f79d87..dcf19c5 100644 --- a/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java +++ b/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java @@ -36,7 +36,7 @@ public abstract class RedisPoolCacheStore implements CacheStore { if(jedisPool.isClosed()) { throw new IllegalStateException("JedisPool is closed"); } - log = LoggerFactory.getLogger(this.getClass().getSimpleName() + "@" + Integer.toHexString(jedisPool.hashCode())); + log = LoggerFactory.getLogger(this.getClass().getName() + "@" + Integer.toHexString(jedisPool.hashCode())); if(!Strings.isNullOrEmpty(keyPrefix)) { this.keyPrefix = keyPrefix.endsWith(".") ? keyPrefix : keyPrefix + "."; } else { diff --git a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java index 4c551ee..5ce3bff 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java +++ b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java @@ -38,7 +38,7 @@ public class BotEventHandler implements EventHandler { private final ArgumentsRunner processRunner; private final ArgumentsRunner adminRunner; - private final static Logger log = LoggerFactory.getLogger("BotEventHandler"); + private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class.getName()); /** * 所有缓存共用的JedisPool diff --git a/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java index f77a253..fe5449d 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java @@ -18,7 +18,7 @@ public class CQPluginMain extends CQPlugin implements EventHandler { public CQPluginMain() { // TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder BotEventHandler.preLoad(); - LoggerFactory.getLogger(this.toString()) + LoggerFactory.getLogger(CQPluginMain.class.getName()) .info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX); } diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java index b43f833..7250058 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java @@ -19,7 +19,7 @@ import java.util.Properties; public class MiraiMain implements Closeable { - private final Logger log = LoggerFactory.getLogger(this.toString()); + private final Logger log = LoggerFactory.getLogger(MiraiMain.class.getName()); private Bot bot; diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java index 4f50bd2..2a187a2 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java @@ -29,7 +29,7 @@ public class MiraiMessageSender implements MessageSender { private final Contact member; private final MessageSource source; - private final static Logger log = LoggerFactory.getLogger("MiraiMessageSender"); + private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class.getName()); private final static CacheStore imageIdCache = new HotDataCacheStore<>( new StringRedisCacheStore(BotEventHandler.redisServer, "mirai.imageId"), new LocalHashCacheStore<>(), diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java index bcf94fa..21ebe55 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java @@ -33,7 +33,7 @@ import java.util.function.BiConsumer; public class PixivDownload { - private final static Logger log = LoggerFactory.getLogger("PixivDownload"); + private final static Logger log = LoggerFactory.getLogger(PixivDownload.class.getName()); private final HttpClient httpClient; diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java b/src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java index b5d024e..eaaa79b 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java @@ -30,7 +30,7 @@ import java.util.zip.ZipInputStream; */ public final class PixivUgoiraBuilder { - private final Logger log = LoggerFactory.getLogger(PixivUgoiraBuilder.class.getSimpleName() + "@" + Integer.toHexString(this.hashCode())); + private final Logger log = LoggerFactory.getLogger(this.toString()); private final HttpClient httpClient; private final JsonObject ugoiraMeta; diff --git a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java index f589f9b..9c8646c 100644 --- a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java +++ b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java @@ -27,7 +27,7 @@ import java.util.List; */ public class PixivAccessProxyServer { - private final Logger log = LoggerFactory.getLogger(this.getClass().getSimpleName()); + private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class.getName()); private final HttpProxyServer proxyServer; diff --git a/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java b/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java index 6a19830..8842474 100644 --- a/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java +++ b/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java @@ -31,7 +31,7 @@ public class PixivDownloadTest { private static CookieStore cookieStore; - private final static Logger log = LoggerFactory.getLogger("PixivDownloadTest"); + private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class.getName()); private static HttpHost proxy = new HttpHost("127.0.0.1", 1001); @@ -180,9 +180,8 @@ public class PixivDownloadTest { log.info("正在调用方法..."); try { - pixivDownload.getRankingAsInputStream(null, null, queryDate, 5, 50, PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> { - log.info("空操作"); - }); + pixivDownload.getRankingAsInputStream(null, null, queryDate, 5, 50, + PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> log.info("空操作")); } finally { zos.finish(); zos.flush();