Merge fc8aec6 into a6eebc7

index.js

@@ -18,6 +18,7 @@ module.exports = morgan
 module.exports.compile = compile
 module.exports.format = format
 module.exports.token = token
+module.exports.silent = false
 
 /**
  * Module dependencies.
@@ -101,6 +102,10 @@ function morgan (format, options) {
   }
 
   return function logger (req, res, next) {
+    if (module.exports.silent) {
+      return next()
+    }
+
     // request data
     req._startAt = undefined
     req._startTime = undefined

test/morgan.js

@@ -1290,6 +1290,25 @@ describe('morgan()', function () {
       .expect(200, done)
     })
   })
+
+  describe('on silent mode', function () {
+    before(function () {
+      morgan.silent = true
+    })
+    after(function () {
+      morgan.silent = false
+    })
+
+    it('should not log any output', function (done) {
+      var stream = createLineStream(function () {
+        throw new Error('should not log line')
+      })
+
+      request(createServer({ format: 'default', stream: stream }))
+      .get('/')
+      .expect(200, done)
+    })
+  })
 })
 
 describe('morgan.compile(format)', function () {