Winston 3 compatibility

lib/winston-loggly.js

@@ -6,10 +6,11 @@
  *
  */
 
-var events = require('events'),
+var clone = require('clone'),
     loggly = require('node-loggly-bulk'),
     util = require('util'),
     winston = require('winston'),
+    Transport = require('winston-transport'),
     Stream = require('stream').Stream;
 
 //
@@ -35,7 +36,7 @@ var Loggly = exports.Loggly = function (options) {
     options.token = options.inputToken;
   }
 
-  winston.Transport.call(this, options);
+  Transport.call(this, options);
   if (!options.subdomain) {
     throw new Error('Loggly Subdomain is required');
   }
@@ -52,7 +53,7 @@ var Loggly = exports.Loggly = function (options) {
   this.client = loggly.createClient({
     subdomain: options.subdomain,
     auth: options.auth || null,
-    json: options.json || false,
+    json: options.json || false, //TODO: should be false
     proxy: options.proxy || null,
     token: options.token,
     tags: tags,
@@ -79,7 +80,7 @@ var flushLogsAndExit = exports.flushLogsAndExit = function () {
 //
 // Inherit from `winston.Transport`.
 //
-util.inherits(Loggly, winston.Transport);
+util.inherits(Loggly, Transport);
 
 //
 // Define a getter so that `winston.transports.Loggly`
@@ -93,6 +94,16 @@ winston.transports.flushLogsAndExit = flushLogsAndExit;
 //
 Loggly.prototype.name = 'loggly';
 
+const validateMetadata = (meta) => {
+  if (meta == null) {
+    return {};
+  } else if (typeof meta !== 'object') {
+    return { metadata: meta };
+  } else {
+    return clone(meta);
+  }
+}
+
 //
 // ### function log (level, msg, [meta], callback)
 // #### @level {string} Level at which to log the message.
@@ -102,21 +113,22 @@ Loggly.prototype.name = 'loggly';
 // Core logging method exposed to Winston. Metadata is optional.
 //
 Loggly.prototype.log = function (level, msg, meta, callback) {
+
+  const message = validateMetadata(meta);
+
   if (this.silent) {
     return callback(null, true);
   }
 
-  if (this.timestamp && (!meta || !meta.timestamp)) {
-    meta = meta || {};
-    meta.timestamp = (new Date()).toISOString();
+  if (this.timestamp && !message.timestamp) {
+    message.timestamp = (new Date()).toISOString();
   }
 
   if (this.stripColors) {
     msg = ('' + msg).replace(code, '');
   }
 
-  var message = winston.clone(meta || {}),
-      self    = this;
+  const self = this;
 
   message.level = level;
   message.message = msg || message.message;
@@ -129,7 +141,11 @@ Loggly.prototype.log = function (level, msg, meta, callback) {
     callback(err, true);
   }
 
+<<<<<<< HEAD
+  return (meta && meta.tags)
+=======
   return meta && meta.tags
+>>>>>>> 0feed30d2ec0acd6f6d7260aca6b6de71ca50c76
     ? this.client.log(message, meta.tags, logged)
     : this.client.log(message, logged);
 };
@@ -139,9 +155,9 @@ Loggly.prototype.log = function (level, msg, meta, callback) {
 // #### @options {Object} Set stream options
 // Returns a log stream.
 //
-Loggly.prototype.stream = function(options) {
+Loggly.prototype.stream = function(maybeOptions) {
   var self = this,
-      options = options || {},
+      options = maybeOptions || {},
       stream = new Stream,
       last,
       start = options.start,
@@ -173,15 +189,15 @@ Loggly.prototype.stream = function(options) {
         return setTimeout(check, 2000);
       }
 
-      var result = res[res.length-1];
+      var result = results[results.length-1];
       if (result && result.timestamp) {
         if (last == null) {
           last = result.timestamp;
           return;
         }
         last = result.timestamp;
       } else {
-        return func();
+        return;
       }
 
       results.forEach(function(log) {
@@ -234,10 +250,10 @@ Loggly.prototype.formatQuery = function (query) {
 // ### function formatResults (results, options)
 // #### @results {Object|Array} Results returned from `.query`.
 // #### @options {Object} **Optional** Formatting options
-// Formats the specified `results` with the given `options` accordinging
+// Formats the specified `results` with the given `options` according
 // to the implementation of this transport.
 //
-Loggly.prototype.formatResults = function (results, options) {
+Loggly.prototype.formatResults = function (results, _options) {
   return results;
 };