From 75fddcf3f83b0f0845325a3bacd50a2d075360a7 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Sat, 4 Jan 2025 20:57:51 +0800 Subject: [PATCH] =?UTF-8?q?conf(wai):=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/config/components/database.config.js | 3 +++ wai-server/config/components/log4j.config.js | 17 +++++++++++++---- wai-server/utils/logger.util.js | 5 +++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/wai-server/config/components/database.config.js b/wai-server/config/components/database.config.js index 4879ab1..ea66659 100644 --- a/wai-server/config/components/database.config.js +++ b/wai-server/config/components/database.config.js @@ -2,6 +2,7 @@ const joi = require('joi'); const { Sequelize, DataTypes, Op } = require('sequelize'); +const sqlLogger = require('../../utils/logger.util').sqlLogger; /** * Generate a validation schema using joi to check the type of your environment variables @@ -53,6 +54,8 @@ const DB = new Sequelize(databaseConfig.database, databaseConfig.user, databaseC bigNumberStrings: true, }, logQueryParameters: true, + logging: (sql, timing) => sqlLogger.debug(timing, 'ms -', sql), + benchmark: true, pool: { max: 5, diff --git a/wai-server/config/components/log4j.config.js b/wai-server/config/components/log4j.config.js index 45911ec..fc23f6d 100644 --- a/wai-server/config/components/log4j.config.js +++ b/wai-server/config/components/log4j.config.js @@ -10,6 +10,12 @@ const logConfig = { numBackups: 7, // the number of old files that matches the pattern to keep (excluding the hot file). compress: false, }, + emergencies: { type: 'dateFile', filename: 'logs/error', pattern: 'yyyy-MM-dd.log', alwaysIncludePattern: true, numBackups: 30 }, + errors: { + type: 'logLevelFilter', + appender: 'emergencies', + level: 'error', + }, // "everything": { // "type": "multiFile", // "base": "logs/app.", @@ -25,9 +31,13 @@ const logConfig = { }, categories: { default: { - appenders: ['everything'], + appenders: ['everything', 'errors'], level: 'debug', }, + // sql: { + // appenders: ['everything'], + // level: 'debug', + // }, }, }; log4js.configure(logConfig); @@ -38,9 +48,8 @@ log4js.configure(logConfig); // }); const logger = log4js.getLogger(); - // console.log = logger.info.bind(logger); // console.info = logger.info.bind(logger); -// console.error = logger.error.bind(logger); +console.error = logger.error.bind(logger); -module.exports = logger; +module.exports = {}; diff --git a/wai-server/utils/logger.util.js b/wai-server/utils/logger.util.js index faabae6..e0adf09 100644 --- a/wai-server/utils/logger.util.js +++ b/wai-server/utils/logger.util.js @@ -1,4 +1,9 @@ const log4js = require('log4js'); const logger = log4js.getLogger(); +const sqlLogger = log4js.getLogger('SQL'); + module.exports = logger; +module.exports.logger = logger; +module.exports.sqlLogger = sqlLogger; +module.exports.default = logger;