winston-middleware 0.3.1 → 1.1.0

package/Readme.md

@@ -5,8 +5,14 @@
 
 ## Installation
 
+Newcomers should start with the latest branch which makes use of winston 1.x.x:
+
     npm install winston-middleware
 
+If you're already using winston-middleware, and want to stick with the stable version based on winston 0.9.x, you should instead do:
+
+    npm install winston-middleware@0.3.x --save
+
 ## Usage
 
 winston-middleware provides middlewares for request and error logging of your express.js application.  It uses 'whitelists' to select properties from the request and (new in 0.2.x) response objects.

package/index.js

@@ -120,6 +120,12 @@ function errorLogger(options) {
 
     options.requestFilter = options.requestFilter || defaultRequestFilter;
     options.winstonInstance = options.winstonInstance || (new winston.Logger ({ transports: options.transports }));
+    options.msg = options.msg || 'middlewareError';
+
+    // Using mustache style templating
+    var template = _.template(options.msg, null, {
+      interpolate: /\{\{(.+?)\}\}/g
+    });
 
     return function (err, req, res, next) {
 
@@ -128,7 +134,7 @@ function errorLogger(options) {
         exceptionMeta.req = filterObject(req, requestWhitelist, options.requestFilter);
 
         // This is fire and forget, we don't want logging to hold up the request so don't wait for the callback
-        options.winstonInstance.log('error', 'middlewareError', exceptionMeta);
+        options.winstonInstance.log('error', template({err: err, req: req, res: res}), exceptionMeta);
 
         next(err);
     };
@@ -211,8 +217,7 @@ function logger(options) {
               requestWhitelist = requestWhitelist.concat(req._routeWhitelists.req || []);
               responseWhitelist = responseWhitelist.concat(req._routeWhitelists.res || []);
 
-              meta.req = filterObject(req, requestWhitelist, options.requestFilter);
-              meta.res = filterObject(res, responseWhitelist, options.responseFilter);
+              meta.res = res;
 
               if (_.contains(responseWhitelist, 'body')) {
                 if (chunk) {
@@ -223,6 +228,9 @@ function logger(options) {
                 }
               }
 
+              meta.req = filterObject(req, requestWhitelist, options.requestFilter);
+              meta.res = filterObject(res, responseWhitelist, options.responseFilter);
+
               bodyWhitelist = req._routeWhitelists.body || [];
               blacklist = _.union(bodyBlacklist, (req._routeBlacklists.body || []));
 

package/package.json

@@ -17,7 +17,7 @@
     "middleware",
     "colors"
   ],
-  "version": "0.3.1",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/bithavoc/winston-middleware.git"
@@ -49,7 +49,7 @@
   "dependencies": {
     "chalk": "~0.4.0",
     "underscore": "~1.5.2",
-    "winston": "~0.9.0"
+    "winston": "~1.0.0"
   },
   "devDependencies": {
     "blanket": "~1.1.6",