Skip to content

Use default tags in node-loggly client #24

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.

Sign up for GitHub

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

Merged
jcrugzz merged 2 commits into from
Mar 6, 2015
Merged

Use default tags in node-loggly client #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
684a71c
[refactor] Pass default tags to `node-loggly` client instance.
indexzero Mar 6, 2015
a206471
[fix] Minor perf optimization.
indexzero Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions lib/winston-loggly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ var events = require('events'),
winston = require('winston'),
Stream = require('stream').Stream;

//
// Remark: This should be at a higher level.
//
var code = /\u001b\[(\d+(;\d+)*)?m/g;

//
// ### function Loggly (options)
// #### @options {Object} Options for this instance.
Expand All @@ -37,18 +42,19 @@ var Loggly = exports.Loggly = function (options) {
}

this.name = 'loggly';
this.tags = options.tags || options.tag || options.id;
var tags = options.tags || options.tag || options.id;
if (tags && !Array.isArray(tags)) {
tags = [tags];
}

this.client = loggly.createClient({
subdomain: options.subdomain,
auth: options.auth || null,
json: options.json || false,
token: options.token
token: options.token,
tags: tags
});

if (this.tags && !Array.isArray(this.tags)) {
this.tags = [this.tags];
}

this.stripColors = options.stripColors || false;
};

Expand Down Expand Up @@ -82,12 +88,10 @@ Loggly.prototype.log = function (level, msg, meta, callback) {
}

if (this.stripColors) {
var code = /\u001b\[(\d+(;\d+)*)?m/g;
msg = ('' + msg).replace(code, '');
msg = ('' + msg).replace(code, '');
}

var message = winston.clone(meta || {}),
tags = meta.tags || this.tags,
self = this;

message.level = level;
Expand All @@ -101,7 +105,7 @@ Loggly.prototype.log = function (level, msg, meta, callback) {
callback(null, true);
}

return tags
return meta.tags
? this.client.log(message, tags, logged)
: this.client.log(message, logged);
};
Expand Down