simplify method to get remote address

History.md

@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * simplify method to get remote address
+
 1.1.0 / 2014-05-18
 ==================
 

index.js

@@ -82,10 +82,9 @@ exports = module.exports = function logger(options) {
   }
 
   return function logger(req, res, next) {
-    var sock = req.socket;
     req._startAt = process.hrtime();
     req._startTime = new Date;
-    req._remoteAddress = sock.socket ? sock.socket.remoteAddress : sock.remoteAddress;
+    req._remoteAddress = req.connection && req.connection.remoteAddress;
 
     function logRequest(){
       res.removeListener('finish', logRequest);
@@ -248,9 +247,8 @@ exports.token('referrer', function(req){
 exports.token('remote-addr', function(req){
   if (req.ip) return req.ip;
   if (req._remoteAddress) return req._remoteAddress;
-  var sock = req.socket;
-  if (sock.socket) return sock.socket.remoteAddress;
-  return sock.remoteAddress;
+  if (req.connection) return req.connection.remoteAddress;
+  return undefined;
 });
 
 /**

test/test.js

@@ -161,6 +161,22 @@ describe('logger()', function () {
           done()
         })
       })
+
+      it('should not fail if req.connection missing', function (done) {
+        var server = createServer({format: ':remote-addr'}, function (req) {
+          delete req.connection;
+          delete req._remoteAddress;
+        })
+
+        request(server)
+        .get('/')
+        .set('Connection', 'keep-alive')
+        .end(function (err, res) {
+          if (err) return done(err)
+          lastLogLine.should.equal(res.text + '\n')
+          done()
+        })
+      })
     })
 
     describe(':response-time', function () {
@@ -479,9 +495,13 @@ function createServer(opts, fn) {
         fn(req, res)
       }
 
-      if (err) res.statusCode = 500
+      if (err) {
+        res.statusCode = 500
+        res.end(err.message)
+      }
+
       res.setHeader('X-Sent', 'true')
-      res.end(err ? err.message : String(req.connection.remoteAddress))
+      res.end((req.connection && req.connection.remoteAddress) || '-')
     })
   })
 }