Skip to content

Commit e0f4c85

Browse files
committed
Simplify winston handler
1 parent a44227d commit e0f4c85

File tree

4 files changed

+4
-21
lines changed

4 files changed

+4
-21
lines changed

src/cli.ts

100755100644
File mode changed.

src/lib/context.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,14 @@ Context.prototype.done = function(err, message) {
196196
this.logger.log('error', 'End - Error:');
197197
}
198198
if (this.verboseLevel > 0){
199-
this.logger.log('error', err);
199+
this.logger.log('error', utils.processJSON(err));
200200
}
201201
} else {
202202
if (this.verboseLevel > 1){
203203
this.logger.log('info', 'End - Result:');
204204
}
205205
if (this.verboseLevel > 0){
206-
this.logger.log('info', message);
206+
this.logger.log('info', utils.processJSON(message));
207207
}
208208
}
209209
this.finalCallback(); //Destroy env...

src/lib/utils.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,13 @@ export function generateRandomHex(length) {
3131
export function getWinstonConsole() {
3232
var winston = require("winston");
3333
const {combine, colorize, simple} = winston.format;
34-
const _simple = simple();
35-
const myFormat = winston.format(info => {
36-
const stringifiedRest = processJSON(Object.assign({}, info, {
37-
level: undefined,
38-
message: undefined,
39-
splat: undefined
40-
}));
41-
var new_info = {level: info.level, message: info.message};
42-
if (new_info.message == undefined){
43-
new_info.message = "";
44-
}
45-
if (stringifiedRest !== '{}') {
46-
new_info.message += stringifiedRest;
47-
}
48-
return _simple.transform(new_info);
49-
});
50-
5134
const logger = winston.createLogger({
5235
level: "info",
5336
transports: [
5437
new winston.transports.Console({
5538
format: combine(
5639
colorize(),
57-
myFormat()
40+
simple(),
5841
)
5942
})
6043
]

test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ describe("- Testing cli.js", function () {
698698
var r = spawnSync(command[0], command[1]);
699699
process_outputs(r);
700700
assert.equal(r.status, 0);
701-
assert.ok((r.output.indexOf("[Circular]") !== -1), true)
701+
assert.ok((r.output.indexOf("Circular") !== -1), true)
702702
});
703703
});
704704
describe("* Verbose test", function () {

0 commit comments

Comments
 (0)