Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve logging (#4921) 

* improve logging

* Update logger.ts

---------

Co-authored-by: Henry Heng <henryheng@flowiseai.com>
This commit is contained in:
matekungl-byborg 2025-07-25 19:28:31 +02:00 committed by GitHub
parent 5ae6ae2916
commit 8846fd14e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
packages/server/src/utils/logger.ts
View File

@ -20,6 +20,8 @@ let gcsServerStream: any
let gcsErrorStream: any let gcsErrorStream: any
let gcsServerReqStream: any let gcsServerReqStream: any
let requestLogger: any
if (process.env.STORAGE_TYPE === 's3') { if (process.env.STORAGE_TYPE === 's3') {
const accessKeyId = process.env.S3_STORAGE_ACCESS_KEY_ID const accessKeyId = process.env.S3_STORAGE_ACCESS_KEY_ID
const secretAccessKey = process.env.S3_STORAGE_SECRET_ACCESS_KEY const secretAccessKey = process.env.S3_STORAGE_SECRET_ACCESS_KEY
@ -165,6 +167,32 @@ const logger = createLogger({
] ]
}) })
requestLogger = createLogger({
format: combine(timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), format.json(), errors({ stack: true })),
defaultMeta: {
package: 'server'
},
transports: [
...(process.env.DEBUG && process.env.DEBUG === 'true' ? [new transports.Console()] : []),
...(!process.env.STORAGE_TYPE || process.env.STORAGE_TYPE === 'local'
? [
new transports.File({
filename: path.join(logDir, config.logging.express.filename ?? 'server-requests.log.jsonl'),
level: config.logging.express.level ?? 'debug'
})
]
: []),
...(process.env.STORAGE_TYPE === 's3'
? [
new transports.Stream({
stream: s3ServerReqStream
})
]
: []),
...(process.env.STORAGE_TYPE === 'gcs' ? [gcsServerReqStream] : [])
]
})
export function expressRequestLogger(req: Request, res: Response, next: NextFunction): void { export function expressRequestLogger(req: Request, res: Response, next: NextFunction): void {
const unwantedLogURLs = ['/api/v1/node-icon/', '/api/v1/components-credentials-icon/', '/api/v1/ping'] const unwantedLogURLs = ['/api/v1/node-icon/', '/api/v1/components-credentials-icon/', '/api/v1/ping']
@ -175,39 +203,17 @@ export function expressRequestLogger(req: Request, res: Response, next: NextFunc
sanitizedBody.password = '********' sanitizedBody.password = '********'
} }
const fileLogger = createLogger({ // Use the shared requestLogger with request-specific metadata
format: combine(timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), format.json(), errors({ stack: true })), const requestMetadata = {
defaultMeta: { request: {
package: 'server', method: req.method,
request: { url: req.url,
method: req.method, body: sanitizedBody, // Use sanitized body instead of raw body
url: req.url, query: req.query,
body: sanitizedBody, // Use sanitized body instead of raw body params: req.params,
query: req.query, headers: req.headers
params: req.params, }
headers: req.headers }
}
},
transports: [
...(process.env.DEBUG && process.env.DEBUG === 'true' ? [new transports.Console()] : []),
...(!process.env.STORAGE_TYPE || process.env.STORAGE_TYPE === 'local'
? [
new transports.File({
filename: path.join(logDir, config.logging.express.filename ?? 'server-requests.log.jsonl'),
level: config.logging.express.level ?? 'debug'
})
]
: []),
...(process.env.STORAGE_TYPE === 's3'
? [
new transports.Stream({
stream: s3ServerReqStream
})
]
: []),
...(process.env.STORAGE_TYPE === 'gcs' ? [gcsServerReqStream] : [])
]
})
const getRequestEmoji = (method: string) => { const getRequestEmoji = (method: string) => {
const requetsEmojis: Record<string, string> = { const requetsEmojis: Record<string, string> = {
@ -222,10 +228,10 @@ export function expressRequestLogger(req: Request, res: Response, next: NextFunc
} }
if (req.method !== 'GET') { if (req.method !== 'GET') {
fileLogger.info(`${getRequestEmoji(req.method)} ${req.method} ${req.url}`) requestLogger.info(`${getRequestEmoji(req.method)} ${req.method} ${req.url}`, requestMetadata)
logger.info(`${getRequestEmoji(req.method)} ${req.method} ${req.url}`) logger.info(`${getRequestEmoji(req.method)} ${req.method} ${req.url}`)
} else { } else {
fileLogger.http(`${getRequestEmoji(req.method)} ${req.method} ${req.url}`) requestLogger.http(`${getRequestEmoji(req.method)} ${req.method} ${req.url}`, requestMetadata)
} }
} }