From 715221334490457b3c8f4de0b9c211b4435e80ca Mon Sep 17 00:00:00 2001
From: "Wesley F. Young" <willamwei@outlook.com>
Date: Mon, 12 Aug 2024 01:12:27 +0800
Subject: [PATCH] fix: inherit logging level from config

---
 src/common/utils/log.ts | 11 +++++------
 src/core/core.ts        | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/common/utils/log.ts b/src/common/utils/log.ts
index 441025b1..f65551f2 100644
--- a/src/common/utils/log.ts
+++ b/src/common/utils/log.ts
@@ -68,7 +68,7 @@ export class LogWrapper {
         this.setLogSelfInfo({ nick: '', uin: '', uid: '' });
     }
 
-    setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
+    setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
         this.logConfig.categories.file.level = fileLogLevel;
         this.logConfig.categories.console.level = consoleLogLevel;
         log4js.configure(this.logConfig);
@@ -81,13 +81,12 @@ export class LogWrapper {
         this.loggerDefault.addContext('userInfo', userInfo);
     }
 
-
-    enableFileLog(enable: boolean) {
-        this.fileLogEnabled = enable;
+    setFileLogEnabled(isEnabled: boolean) {
+        this.fileLogEnabled = isEnabled;
     }
 
-    enableConsoleLog(enable: boolean) {
-        this.consoleLogEnabled = enable;
+    setConsoleLogEnabled(isEnabled: boolean) {
+        this.consoleLogEnabled = isEnabled;
     }
 
     formatMsg(msg: any[]) {
diff --git a/src/core/core.ts b/src/core/core.ts
index 13dd2eb9..c6b8bbb8 100644
--- a/src/core/core.ts
+++ b/src/core/core.ts
@@ -10,6 +10,7 @@ import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NT
 import os from 'node:os';
 import { NTQQCollectionApi } from './apis/collection';
 import { NapCatConfigLoader } from './helper/config';
+import { LogLevel } from '@/common/utils/log';
 
 export enum NapCatCoreWorkingEnv {
     Unknown = 0,
@@ -55,7 +56,7 @@ export class NapCatCore {
             UserApi: new NTQQUserApi(this.context, this),
             GroupApi: new NTQQGroupApi(this.context, this),
         };
-        this.configLoader = new NapCatConfigLoader(this,this.context.pathWrapper.configPath);
+        this.configLoader = new NapCatConfigLoader(this, this.context.pathWrapper.configPath);
         this.NapCatDataPath = path.join(this.dataPath, 'NapCat');
         fs.mkdirSync(this.NapCatDataPath, { recursive: true });
         this.NapCatTempPath = path.join(this.NapCatDataPath, 'temp');
@@ -64,6 +65,17 @@ export class NapCatCore {
             fs.mkdirSync(this.NapCatTempPath, { recursive: true });
         }
         this.initNapCatCoreListeners().then().catch(this.context.logger.logError);
+
+        this.context.logger.setFileLogEnabled(
+            this.configLoader.configData.fileLog,
+        );
+        this.context.logger.setConsoleLogEnabled(
+            this.configLoader.configData.consoleLog,
+        );
+        this.context.logger.setFileAndConsoleLogLevel(
+            this.configLoader.configData.fileLogLevel as LogLevel,
+            this.configLoader.configData.consoleLogLevel as LogLevel,
+        );
     }
 
     get dataPath(): string {