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.

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

Honor silent option, don't include timestamp in msg #46

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Honor silent option, don't include timestamp in msg #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions lib/winston-syslog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ var Syslog = exports.Syslog = function (options) {
this.label = options.label || null;
this.logstash = options.logstash || false;
this.depth = options.depth || null;
this.silent = options.silent || false;

//
// Merge the options for the target Syslog server.
Expand Down Expand Up @@ -118,23 +119,27 @@ Syslog.prototype.name = 'Syslog';
// Core logging method exposed to Winston. Logs the `msg` and optional
// metadata, `meta`, to the specified `level`.
//
Syslog.prototype.log = function (level, msg, meta, callback) {
var self = this,
syslogMsg,
buffer;
Syslog.prototype.log = function (timestamp, level, msg, meta, callback) {
if (this.silent) {
return callback(null, true);
}

if (!~levels.indexOf(level)) {
return callback(new Error('Cannot log unknown syslog level: ' + level));
}

var self = this,
syslogMsg,
buffer;

var output = common.log({
colorize: this.colorize,
json: this.json,
level: level,
message: msg,
meta: meta,
stringify: this.stringify,
timestamp: this.timestamp,
timestamp: null,
showLevel: this.showLevel,
prettyPrint: this.prettyPrint,
raw: this.raw,
Expand All @@ -149,7 +154,7 @@ Syslog.prototype.log = function (level, msg, meta, callback) {
severity: level,
host: this.localhost,
app_id: this.appId || process.title,
date: new Date(),
date: timestamp || this.timestamp || new Date(),
message: output
});

Expand Down