diff --git a/api/src/index.ts b/api/src/index.ts index cba919b..347a05a 100644 --- a/api/src/index.ts +++ b/api/src/index.ts @@ -22,8 +22,8 @@ app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express. path: tokens.url(req, res), status: Number(tokens.status(req, res)), response_time_ms: Number(tokens['response-time'](req, res)), - user_id: req.user.id, - user_name: req.user.name, + user_id: req.user?.id, + user_name: req.user?.name, user_agent: req.headers['user-agent'], }, } diff --git a/api/src/services/logging/logger.ts b/api/src/services/logging/logger.ts index 3c59bde..bf48885 100644 --- a/api/src/services/logging/logger.ts +++ b/api/src/services/logging/logger.ts @@ -20,12 +20,14 @@ const CURRENT_DEPTH: LogDepth = (process.env.LOG_DEPTH as LogDepth) || 'normal'; const DEPTH_ORDER: Record = { normal: 0, verbose: 1 }; -function shouldLog(level: LogLevel, depth: LogDepth) { - return DEPTH_ORDER[depth] >= DEPTH_ORDER[CURRENT_DEPTH]; +function shouldLog(depth: LogDepth) { + let should = DEPTH_ORDER[depth] <= DEPTH_ORDER[CURRENT_DEPTH] + return should; } function emitLog(header: LogHeader, payload: LogPayload = {}) { - if (!shouldLog(header.level, header.depth)) return; + if (!shouldLog(header.depth)) return; + console.log(header, payload); const logLine = { ...header, ...payload }; console.log(JSON.stringify(logLine)); diff --git a/api/tsconfig.json b/api/tsconfig.json index 8893066..d4ab451 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -7,6 +7,7 @@ "node", "express" ], + "sourceMap": true, "paths": { "@app/shared/*": ["../shared/*"] }