From edac89b2048d76123d53eacc4938067a321c67c8 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Wed, 20 Aug 2014 10:56:36 -0500 Subject: [PATCH] Fix x-forwarded-for resolution in http logging --- lib/web/webserver.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/web/webserver.js b/lib/web/webserver.js index 43df732e..41192cf1 100644 --- a/lib/web/webserver.js +++ b/lib/web/webserver.js @@ -14,6 +14,9 @@ var cookieParser = require("cookie-parser"); var static = require("serve-static"); var morgan = require("morgan"); +const LOG_FORMAT = ':real-address - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"' +morgan.token("real-address", ipForRequest); + /** * Extracts an IP address from a request. Uses X-Forwarded-For if the IP is localhost */ @@ -203,7 +206,7 @@ module.exports = { init: function (app) { app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); - app.use(morgan("combined", { + app.use(morgan(LOG_FORMAT, { stream: require("fs").createWriteStream(path.join(__dirname, "..", "..", "http.log"), { flags: "a",