Fix backwards compatibility in logger

senchalabs · Aug 12, 2014 · a50c28c · a50c28c
1 parent 46be102
commit a50c28c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+2.x
+===
+
+  * Fix backwards compatibility in `logger`
+
 2.25.4 / 2014-08-10
 ===================
 

diff --git a/lib/middleware/logger.js b/lib/middleware/logger.js
@@ -41,3 +41,5 @@ module.exports = function logger(options) {
 
   return morgan(opts.format, opts);
 };
+
+utils.merge(module.exports, morgan);
diff --git a/test/logger.js b/test/logger.js
@@ -24,4 +24,20 @@ describe('connect.logger()', function () {
       });
     })
   })
+
+  describe('with custom token', function () {
+    it('should output the custom token', function (done) {
+      var app = connect();
+      connect.logger.token('custom', function (req) { return req.headers['x-custom-value']; });
+      app.use(connect.logger({'format': ':custom', 'stream': {'write': saveLastLogLine}}));
+
+      app.request()
+      .get('/')
+      .set('x-custom-value', 'so_custom')
+      .end(function (res) {
+        lastLogLine.should.equal('so_custom\n');
+        done();
+      });
+    })
+  })
 });