From 728aa901efff53341623663674aa4b5f2d1518a1 Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Tue, 22 Apr 2025 15:41:01 +0200 Subject: [PATCH] chore: Add LOG_LEVEL to environment samples --- docker-compose-dev.yml | 2 ++ docker-compose.yml | 2 ++ server/.env.sample | 1 + server/utils/logger.js | 9 ++++----- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index be4cf09d..e67f16f5 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -13,6 +13,8 @@ services: - DATABASE_URL=postgresql://user:password@postgres:5432/planka_db - SECRET_KEY=notsecretkey + # - LOG_LEVEL=warn + # - TRUST_PROXY=0 # - TOKEN_EXPIRES_IN=365 # In days diff --git a/docker-compose.yml b/docker-compose.yml index b6fbb7cb..215da1b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: - DATABASE_URL=postgresql://postgres@postgres/planka - SECRET_KEY=notsecretkey + # - LOG_LEVEL=warn + # - TRUST_PROXY=0 # - TOKEN_EXPIRES_IN=365 # In days diff --git a/server/.env.sample b/server/.env.sample index 8433a8cf..20931c89 100644 --- a/server/.env.sample +++ b/server/.env.sample @@ -6,6 +6,7 @@ SECRET_KEY=notsecretkey ## Optional +# LOG_LEVEL=warn # LOG_FILE= # TRUST_PROXY=0 diff --git a/server/utils/logger.js b/server/utils/logger.js index 2a62f8a4..1e54b15e 100644 --- a/server/utils/logger.js +++ b/server/utils/logger.js @@ -6,16 +6,13 @@ const winston = require('winston'); */ const defaultLogTimestampFormat = 'YYYY-MM-DD HH:mm:ss'; -const logfile = - 'LOG_FILE' in process.env ? process.env.LOG_FILE : `${process.cwd()}/logs/planka.log`; - /** * Log level for both console and file log sinks. * * Refer {@link https://github.com/winstonjs/winston#logging here} * for more information on Winston log levels. */ -const logLevel = 'LOG_LEVEL' in process.env ? process.env.LOG_LEVEL : 'warn'; +const logLevel = process.env.LOG_LEVEL || 'warn'; const logFormat = winston.format.combine( winston.format.uncolorize(), @@ -23,13 +20,15 @@ const logFormat = winston.format.combine( winston.format.printf((log) => `${log.timestamp} [${log.level[0].toUpperCase()}] ${log.message}`), ); +const logFile = process.env.LOG_FILE || `${process.cwd()}/logs/planka.log`; + // eslint-disable-next-line new-cap const customLogger = new winston.createLogger({ transports: [ new winston.transports.File({ level: logLevel, format: logFormat, - filename: logfile, + filename: logFile, }), new winston.transports.Console({ level: logLevel,