passenger 6.0.12 → 6.0.13

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/common.js

@@ -32,7 +32,7 @@ exports.setLevels = function (target, past, current, isDefault) {
   }
 
   target.levels = current || config.npm.levels;
-  if (target.padLevels) {
+  if (target.hasOwnProperty('padLevels') && target.padLevels) {
     target.levelLength = exports.longestElement(Object.keys(target.levels));
   }
 
@@ -77,20 +77,15 @@ exports.longestElement = function (xs) {
 // i.e. JSON objects that are either literals or objects (no Arrays, etc)
 //
 exports.clone = function (obj) {
-  //
-  // We only need to clone reference types (Object)
-  //
-  var copy = {};
-
   if (obj instanceof Error) {
     // With potential custom Error objects, this might not be exactly correct,
     // but probably close-enough for purposes of this lib.
-    copy = new Error(obj.message);
+    var copy = { message: obj.message };
     Object.getOwnPropertyNames(obj).forEach(function (key) {
       copy[key] = obj[key];
     });
 
-    return copy;
+    return cycle.decycle(copy);
   }
   else if (!(obj instanceof Object)) {
     return obj;
@@ -99,23 +94,34 @@ exports.clone = function (obj) {
     return new Date(obj.getTime());
   }
 
+  return clone(cycle.decycle(obj));
+};
+
+function clone(obj) {
+  //
+  // We only need to clone reference types (Object)
+  //
+  var copy = Array.isArray(obj) ? [] : {};
+
   for (var i in obj) {
-    if (Array.isArray(obj[i])) {
-      copy[i] = obj[i].slice(0);
-    }
-    else if (obj[i] instanceof Buffer) {
+    if (obj.hasOwnProperty(i)) {
+      if (Array.isArray(obj[i])) {
         copy[i] = obj[i].slice(0);
-    }
-    else if (typeof obj[i] != 'function') {
-      copy[i] = obj[i] instanceof Object ? exports.clone(obj[i]) : obj[i];
-    }
-    else if (typeof obj[i] === 'function') {
-      copy[i] = obj[i];
+      }
+      else if (obj[i] instanceof Buffer) {
+        copy[i] = obj[i].slice(0);
+      }
+      else if (typeof obj[i] != 'function') {
+        copy[i] = obj[i] instanceof Object ? exports.clone(obj[i]) : obj[i];
+      }
+      else if (typeof obj[i] === 'function') {
+        copy[i] = obj[i];
+      }
     }
   }
 
   return copy;
-};
+}
 
 //
 // ### function log (options)
@@ -139,8 +145,8 @@ exports.log = function (options) {
         : exports.timestamp,
       timestamp   = options.timestamp ? timestampFn() : null,
       showLevel   = options.showLevel === undefined ? true : options.showLevel,
-      meta        = options.meta !== null && options.meta !== undefined && !(options.meta instanceof Error)
-        ? exports.clone(cycle.decycle(options.meta))
+      meta        = options.meta !== null && options.meta !== undefined
+        ? exports.clone(options.meta)
         : options.meta || null,
       output;
 
@@ -214,6 +220,12 @@ exports.log = function (options) {
   // Remark: this should really be a call to `util.format`.
   //
   if (typeof options.formatter == 'function') {
+    options.meta = meta || options.meta;
+    if (options.meta instanceof Error) {
+      // Force converting the Error to an plain object now so it
+      // will not be messed up by decycle() when cloning options
+      options.meta = exports.clone(options.meta);
+    }
     return String(options.formatter(exports.clone(options)));
   }
 
@@ -232,10 +244,6 @@ exports.log = function (options) {
     : options.message;
 
   if (meta !== null && meta !== undefined) {
-    if (meta && meta instanceof Error && meta.stack) {
-      meta = meta.stack;
-    }
-
     if (typeof meta !== 'object') {
       output += ' ' + meta;
     }
@@ -246,7 +254,7 @@ exports.log = function (options) {
         output += ' ' + '\n' + util.inspect(meta, false, options.depth || null, options.colorize);
       } else if (
         options.humanReadableUnhandledException
-          && Object.keys(meta).length === 5
+          && Object.keys(meta).length >= 5
           && meta.hasOwnProperty('date')
           && meta.hasOwnProperty('process')
           && meta.hasOwnProperty('os')
@@ -260,7 +268,10 @@ exports.log = function (options) {
         delete meta.stack;
         delete meta.trace;
         output += ' ' + exports.serialize(meta);
-        output += '\n' + stack.join('\n');
+
+        if (stack) {
+          output += '\n' + stack.join('\n');
+        }
       } else {
         output += ' ' + exports.serialize(meta);
       }
@@ -308,6 +319,14 @@ exports.timestamp = function () {
 // logging to non-JSON inputs.
 //
 exports.serialize = function (obj, key) {
+  // symbols cannot be directly casted to strings
+  if (typeof key === 'symbol') {
+    key = key.toString()
+  }
+  if (typeof obj === 'symbol') {
+    obj = obj.toString()
+  }
+
   if (obj === null) {
     obj = 'null';
   }
@@ -365,7 +384,7 @@ exports.serialize = function (obj, key) {
 // `tail -f` a file. Options must include file.
 //
 exports.tailFile = function(options, callback) {
-  var buffer = new Buffer(64 * 1024)
+  var buffer = Buffer.alloc(64 * 1024)
     , decode = new StringDecoder('utf8')
     , stream = new Stream
     , buff = ''
@@ -396,7 +415,7 @@ exports.tailFile = function(options, callback) {
 
     (function read() {
       if (stream.destroyed) {
-        fs.close(fd);
+        fs.close(fd, nop);
         return;
       }
 
@@ -481,3 +500,5 @@ exports.stringArrayToSet = function (strArray, errMsg) {
     return set;
   }, Object.create(null));
 };
+
+function nop () {}

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/cli-config.js

@@ -9,27 +9,27 @@
 var cliConfig = exports;
 
 cliConfig.levels = {
-  silly: 0,
-  input: 1,
-  verbose: 2,
-  prompt: 3,
-  debug: 4,
-  info: 5,
-  data: 6,
-  help: 7,
-  warn: 8,
-  error: 9
+  error: 0,
+  warn: 1,
+  help: 2,
+  data: 3,
+  info: 4,
+  debug: 5,
+  prompt: 6,
+  verbose: 7,
+  input: 8,
+  silly: 9,
 };
 
 cliConfig.colors = {
-  silly: 'magenta',
-  input: 'grey',
-  verbose: 'cyan',
-  prompt: 'grey',
-  debug: 'blue',
-  info: 'green',
-  data: 'grey',
-  help: 'cyan',
+  error: 'red',
   warn: 'yellow',
-  error: 'red'
-};
+  help: 'cyan',
+  data: 'grey',
+  info: 'green',
+  debug: 'blue',
+  prompt: 'grey',
+  verbose: 'cyan',
+  input: 'grey',
+  silly: 'magenta'
+};

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/npm-config.js

@@ -9,19 +9,19 @@
 var npmConfig = exports;
 
 npmConfig.levels = {
-  silly: 0,
-  debug: 1,
-  verbose: 2,
-  info: 3,
-  warn: 4,
-  error: 5
+  error: 0,
+  warn: 1,
+  info: 2,
+  verbose: 3,
+  debug: 4,
+  silly: 5
 };
 
 npmConfig.colors = {
-  silly: 'magenta',
+  error: 'red',
+  warn: 'yellow',
+  info: 'green',
   verbose: 'cyan',
   debug: 'blue',
-  info: 'green',
-  warn: 'yellow',
-  error: 'red'
-};
+  silly: 'magenta'
+};

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/syslog-config.js

@@ -16,7 +16,7 @@ syslogConfig.levels = {
   warning: 4,
   notice: 5,
   info: 6,
-  debug: 7,
+  debug: 7
 };
 
 syslogConfig.colors = {
@@ -27,5 +27,5 @@ syslogConfig.colors = {
   warning: 'red',
   notice: 'yellow',
   info: 'green',
-  debug: 'blue',
-};
+  debug: 'blue'
+};

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config.js

@@ -8,6 +8,9 @@
 
 var colors = require('colors/safe');
 
+// Fix colors not appearing in non-tty environments
+colors.enabled = true;
+
 var config = exports,
     allColors = exports.allColors = {};
 
@@ -23,15 +26,18 @@ config.colorize = function (level, message) {
     for (var i = 0, l = allColors[level].length; i < l; ++i) {
       colorized = colors[allColors[level][i]](colorized);
     }
-  } else if (allColors[level].match(/\s/)) {
+  }
+  else if (allColors[level].match(/\s/)) {
     var colorArr = allColors[level].split(/\s+/);
     for (var i = 0; i < colorArr.length; ++i) {
       colorized = colors[colorArr[i]](colorized);
     }
     allColors[level] = colorArr;
-  } else {
+  }
+  else {
     colorized = colors[allColors[level]](colorized);
   }
+
   return colorized;
 };
 

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/container.js

@@ -58,7 +58,7 @@ Container.prototype.get = Container.prototype.add = function (id, options) {
     }
 
     Object.keys(options).forEach(function (key) {
-      if (key === 'transports') {
+      if (key === 'transports' || key === 'filters' || key === 'rewriters') {
         return;
       }
 
@@ -73,6 +73,7 @@ Container.prototype.get = Container.prototype.add = function (id, options) {
       options.transports.push(new (winston.transports[name])(namedOptions));
     });
 
+    options.id = id;
     this.loggers[id] = new winston.Logger(options);
 
     this.loggers[id].on('close', function () {