Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LOG-8039 update packages #59

Merged
merged 18 commits into from Apr 6, 2020

LOG-8039 prettier settings

  • Loading branch information
alestrunda committed Mar 26, 2020
commit cba56c62b581a21ee0b4ba14c139f35c9d6fb2a4
@@ -6,12 +6,12 @@
*
*/

var clone = require("clone"),
loggly = require("node-loggly-bulk"),
util = require("util"),
winston = require("winston"),
Transport = require("winston-transport"),
Stream = require("stream").Stream;
var clone = require('clone'),
loggly = require('node-loggly-bulk'),
util = require('util'),
winston = require('winston'),
Transport = require('winston-transport'),
Stream = require('stream').Stream;

//
// Remark: This should be at a higher level.
@@ -38,12 +38,12 @@ var Loggly = (exports.Loggly = function(options) {

Transport.call(this, options);
if (!options.subdomain) {
throw new Error("Loggly Subdomain is required");
throw new Error('Loggly Subdomain is required');
} else if (!options || !options.token) {
throw new Error("Loggly Customer token is required.");
throw new Error('Loggly Customer token is required.');
}

this.name = "loggly";
this.name = 'loggly';
var tags = options.tags || options.tag || options.id;
if (tags && !Array.isArray(tags)) {
tags = [tags];
@@ -95,12 +95,12 @@ winston.transports.flushLogsAndExit = flushLogsAndExit;
//
// Expose the name of this Transport on the prototype
//
Loggly.prototype.name = "loggly";
Loggly.prototype.name = 'loggly';

const validateMetadata = meta => {
if (meta == null) {
return {};
} else if (typeof meta !== "object") {
} else if (typeof meta !== 'object') {
return { Metadata: meta };
This conversation was marked as resolved by michal-bures

This comment has been minimized.

@michal-bures

michal-bures Mar 26, 2020

Woah, why the change to upper case? That would be breaking change for many users right?

This comment has been minimized.

@alestrunda

alestrunda Mar 26, 2020
Author

I was doing some tests because of the "metadata" prop issue I reported, forgot to put it back, it should be lowercase of course.

} else {
return clone(meta);
@@ -125,7 +125,7 @@ Loggly.prototype.log = function(meta, callback) {
}

if (this.stripColors) {
message.message = ("" + message.message).replace(code, "");
message.message = ('' + message.message).replace(code, '');
}

const self = this;
@@ -134,7 +134,7 @@ Loggly.prototype.log = function(meta, callback) {
// Helper function for responded to logging.
//
function logged(err, result) {
self.emit("logged");
self.emit('logged');
callback && callback(err, result);
}

@@ -176,14 +176,14 @@ Loggly.prototype.stream = function(maybeOptions) {
(function check() {
self.query(
{
from: last || "NOW-1DAY",
until: "NOW"
from: last || 'NOW-1DAY',
until: 'NOW'
},
function(err, results) {
if (stream.destroyed) return;

if (err) {
stream.emit("error", err);
stream.emit('error', err);
return setTimeout(check, 2000);
}

@@ -200,7 +200,7 @@ Loggly.prototype.stream = function(maybeOptions) {

results.forEach(function(log) {
if (start == null || row > start) {
stream.emit("log", log);
stream.emit('log', log);
}
row++;
});
@@ -263,14 +263,14 @@ Loggly.prototype.extractContext = function(obj) {
var context = {};

[
"start",
"from",
"until",
"order",
"callback",
"size",
"format",
"fields"
'start',
'from',
'until',
'order',
'callback',
'size',
'format',
'fields'
].forEach(function(key) {
if (obj[key]) {
context[key] = obj[key];
@@ -282,8 +282,8 @@ Loggly.prototype.extractContext = function(obj) {
context.from = context.from.toISOString();
context.until = context.until.toISOString();

context.from = context.from || "-1d";
context.until = context.until || "now";
context.from = context.from || '-1d';
context.until = context.until || 'now';
context.size = context.size || 50;

return context;
@@ -301,26 +301,26 @@ Loggly.prototype.loglify = function(obj) {

Object.keys(obj).forEach(function(key) {
if (
key !== "query" &&
key !== "fields" &&
key !== "start" &&
key !== "rows" &&
key !== "limit" &&
key !== "from" &&
key !== "until"
key !== 'query' &&
key !== 'fields' &&
key !== 'start' &&
key !== 'rows' &&
key !== 'limit' &&
key !== 'from' &&
key !== 'until'
) {
if (key == "tag") {
opts.push(key + ":" + obj[key]);
if (key == 'tag') {
opts.push(key + ':' + obj[key]);
} else {
opts.push("json." + key + ":" + obj[key]);
opts.push('json.' + key + ':' + obj[key]);
}
}
});

if (obj.query) {
opts.unshift(obj.query);
}
return { query: opts.join(" AND ") };
return { query: opts.join(' AND ') };
};

//
@@ -42,5 +42,8 @@
},
"engines": {
"node": ">= 6.4.0"
},
"prettier": {
"singleQuote": true
}
}
@@ -1,39 +1,39 @@
const winston = require("winston");
const winston = require('winston');
module.exports.testLevels = function(transport, assertMsg, assertFn) {
var tests = {};
const levels = winston.config.npm.levels;

Object.keys(levels).forEach(function(level) {
var test = {
topic: function() {
transport.log({ level, message: "test message" }, this.callback);
transport.log({ level, message: 'test message' }, this.callback);
}
};

test[assertMsg] = assertFn;
tests["with the " + level + " level"] = test;
tests['with the ' + level + ' level'] = test;
});

var metadatatest = {
topic: function() {
transport.log(
{ level: "info", message: "test message meta boolean", Metadata: true },
{ level: 'info', message: 'test message meta boolean', Metadata: true },
this.callback
);
}
};

metadatatest[assertMsg] = assertFn;
tests["when passed metadata"] = metadatatest;
tests['when passed metadata'] = metadatatest;

var primmetadatatest = {
topic: function() {
transport.log("metadata", this.callback);
transport.log('metadata', this.callback);
}
};

primmetadatatest[assertMsg] = assertFn;
tests["when passed primitive metadata"] = primmetadatatest;
tests['when passed primitive metadata'] = primmetadatatest;

var nummetadatatest = {
topic: function() {
@@ -42,7 +42,7 @@ module.exports.testLevels = function(transport, assertMsg, assertFn) {
};

nummetadatatest[assertMsg] = assertFn;
tests["when passed numeric metadata"] = nummetadatatest;
tests['when passed numeric metadata'] = nummetadatatest;

return tests;
};
@@ -6,18 +6,18 @@
*
*/

var vows = require("vows"),
assert = require("assert"),
helpers = require("./helpers.js"),
Loggly = require("../lib/winston-loggly").Loggly;
var vows = require('vows'),
assert = require('assert'),
helpers = require('./helpers.js'),
Loggly = require('../lib/winston-loggly').Loggly;

var tokenTransport, config;

try {
config = require("./config");
config = require('./config');
} catch (ex) {
console.error("Error reading test/config.json.");
console.error("Are you sure it exists?\n");
console.error('Error reading test/config.json.');
console.error('Are you sure it exists?\n');
console.dir(ex);
process.exit(1);
}
@@ -27,27 +27,27 @@ tokenTransport = new Loggly({
token: config.transports.loggly.token
});

tokenTransport.log({ level: "warning", message: "test message" });
tokenTransport.log({ level: 'warning', message: 'test message' });

function assertLoggly(transport) {
assert.instanceOf(transport, Loggly);
assert.isFunction(transport.log);
}

vows
.describe("winston-loggly")
.describe('winston-loggly')
.addBatch({
"An instance of the Loggly Transport": {
"when passed an input token": {
"should have the proper methods defined": function() {
'An instance of the Loggly Transport': {
'when passed an input token': {
'should have the proper methods defined': function() {
assertLoggly(tokenTransport);
},
"the log() method": helpers.testLevels(
'the log() method': helpers.testLevels(
tokenTransport,
"should log messages to loggly",
'should log messages to loggly',
function(err, logged) {
assert.isNull(err);
assert.equal(logged && logged.response, "ok");
assert.equal(logged && logged.response, 'ok');
}
)
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.