Skip to content
This repository has been archived by the owner on May 7, 2021. It is now read-only.

Add UUID to the logs per session #56

Merged
merged 4 commits into from
Apr 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const { hasData } = require('./utils')
const { addNunjucksFilters } = require('./filters')
const csp = require('./config/csp.config')
const csrf = require('csurf')
const uuidv4 = require('uuid').v4

// check to see if we have a custom configRoutes function
let { configRoutes, routes, locales } = require('./config/routes.config')
Expand Down Expand Up @@ -78,6 +79,15 @@ app.locals.hasData = hasData
app.locals.basedir = path.join(__dirname, './views')
app.set('views', [path.join(__dirname, './views')])

app.use(function(req, res, next) {
// set a unique user id per session
if (!req.session.id) req.session.id = uuidv4()
// add user id to req.locals so that the logger has access to it
req.locals = { id: req.session.id }

next()
})

app.routes = configRoutes(app, routes, locales)

// view engine setup
Expand Down
7 changes: 6 additions & 1 deletion config/morgan.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ morgan.token('version', function getSha() {
})

morgan.token('err', function getErr(req, res) {
return res.locals.err
return req.locals.err
})

morgan.token('id', function getId(req, res) {
return req.locals.id
})

module.exports = (function morganConfig() {
Expand All @@ -27,6 +31,7 @@ function jsonFormatDev(tokens, req, res) {

function jsonFormatProduction(tokens, req, res) {
return JSON.stringify({
id: tokens['id'](req, res),
method: tokens['method'](req, res),
url: tokens['url'](req, res),
status: tokens['status'](req, res),
Expand Down
16 changes: 13 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"postcss-loader": "^3.0.0",
"request": "^2.88.0",
"tailwindcss": "^1.1.3",
"uuid": "^7.0.3",
"webpack": "^4.42.1",
"webpack-cli": "^3.3.11",
"webpack-merge": "^4.2.2"
Expand Down