fix: Update logs

tosuapp · Dec 9, 2024 · 9a42746 · 9a42746
1 parent 2536925
commit 9a42746
Show file tree

Hide file tree

Showing 35 changed files with 1,281 additions and 1,004 deletions.
diff --git a/packages/common/utils/config.ts b/packages/common/utils/config.ts
@@ -162,7 +162,10 @@ export const updateConfigFile = () => {
     }
 
     if (newOptions !== '') {
-        wLogger.warn(`New options available in config: ${newOptions}\n`);
+        wLogger.warn(
+            '[config]',
+            `New options available in config: ${newOptions}\n`
+        );
     }
 };
 
@@ -200,7 +203,7 @@ export const refreshConfig = (httpServer: any, refresh: boolean) => {
 
     const { parsed, error } = dotenv.config({ path: configPath });
     if (error != null || parsed == null) {
-        wLogger.error(`Config ${status} failed`);
+        wLogger.error('[config]', `Config ${status} failed`);
         return;
     }
 
@@ -295,7 +298,7 @@ export const refreshConfig = (httpServer: any, refresh: boolean) => {
         fs.mkdirSync(staticPath);
     }
 
-    if (updated) wLogger.info(`Config ${status}ed`);
+    if (updated) wLogger.info('[config]', `Config ${status}ed`);
 };
 
 export const writeConfig = (httpServer: any, options: any) => {

diff --git a/packages/common/utils/logger.ts b/packages/common/utils/logger.ts
@@ -29,35 +29,35 @@ export const wLogger = {
         const coloredText = colorText('info');
         console.log(coloredText, ...args);
 
-        if (config.debugLogging === true) writeLog('info', args);
+        writeLog('info', args);
     },
     debug: (...args: any) => {
+        writeLog('debug', args);
+
         if (config.debugLogging !== true) return;
 
         const coloredText = colorText('debug');
         console.log(coloredText, ...args);
-
-        writeLog('debug', args);
     },
     debugError: (...args: any) => {
         if (config.debugLogging !== true) return;
 
         const coloredText = colorText('debugError');
         console.log(coloredText, ...args);
 
-        if (config.debugLogging === true) writeLog('debugError', args);
+        writeLog('debugError', args);
     },
     error: (...args: any) => {
         const coloredText = colorText('error');
         console.log(coloredText, ...args);
 
-        if (config.debugLogging === true) writeLog('error', args);
+        writeLog('error', args);
     },
     warn: (...args: any) => {
         const coloredText = colorText('warn');
         console.log(coloredText, ...args);
 
-        if (config.debugLogging === true) writeLog('warn', args);
+        writeLog('warn', args);
     }
 };
 

diff --git a/packages/common/utils/unzip.ts b/packages/common/utils/unzip.ts
@@ -16,8 +16,8 @@ export const unzip = (zipPath: string, extractPath: string): Promise<string> =>
             zip.extractAllTo(extractPath, /* overwrite */ true);
             resolve(extractPath);
         } catch (error) {
-            wLogger.error((error as any).message);
-            wLogger.debug(error);
+            wLogger.error('[unzip]', (error as any).message);
+            wLogger.debug('[unzip]', error);
             reject(error);
         }
     });
diff --git a/packages/server/index.ts b/packages/server/index.ts
@@ -120,7 +120,7 @@ export class Server {
                 return next();
             }
 
-            wLogger.warn('Unallowed request', req.url, {
+            wLogger.warn('[request]', 'Unallowed request', req.url, {
                 address: req.socket.remoteAddress,
                 origin: req.headers.origin,
                 referer: req.headers.referer

diff --git a/packages/server/router/assets.ts b/packages/server/router/assets.ts
@@ -15,10 +15,8 @@ export default function buildAssetsApi(server: Server) {
             path.join(pkgAssetsPath, req.params.filePath),
             (err, content) => {
                 if (err) {
-                    wLogger.debug(err);
-                    res.writeHead(404, {
-                        'Content-Type': 'text/html'
-                    });
+                    wLogger.debug(`/assets/${req.params.filePath}`, err);
+                    res.writeHead(404, { 'Content-Type': 'text/html' });
 
                     res.end('<html>page not found</html>');
                     return;