[logging] log sender ip address

NormandoHall · Mar 29, 2016 · 41c773f · 41c773f
1 parent 2b9d6fc
commit 41c773f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/logging.js b/logging.js
@@ -2,6 +2,18 @@ var moment = require('moment');
 
 exports.log = function() {
     var args = Array.prototype.slice.apply(arguments);
+
+    // Add ip if request provided.
+    var request = args[0];
+    if (request && request.headers) {
+        args.shift();
+        var remote_addr = request.headers['x-forwarded-for'] || request.connection.remoteAddress;
+        if (remote_addr) {
+            args.splice(0, 0, remote_addr, '-');
+        }
+    }
+
     args.splice(0, 0, "--", moment().utc().format("\\[YY-MM-DD HH:mm:ss\\]"));
+
     console.log.apply(console, args);
 };
diff --git a/modules/api/views.js b/modules/api/views.js
@@ -56,7 +56,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /iframely for', uri);
+        log(req, 'Loading /iframely for', uri);
 
         async.waterfall([
 
@@ -188,7 +188,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /reader for', uri);
+        log(req, 'Loading /reader for', uri);
 
         async.waterfall([
 
@@ -251,7 +251,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /render for', uri);
+        log(req, 'Loading /render for', uri);
 
         async.waterfall([
 
@@ -366,7 +366,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /oembed for', uri);
+        log(req, 'Loading /oembed for', uri);
 
         async.waterfall([
 

diff --git a/utils.js b/utils.js
@@ -222,7 +222,7 @@
 
                                 if (head) {
 
-                                    log("Using cache for", req.url.replace(/\?.+/, ''), req.query.uri || req.query.url);
+                                    log(req, "Using cache for", req.url.replace(/\?.+/, ''), req.query.uri || req.query.url);
 
                                     var requestedEtag = req.headers['if-none-match'];