Comparing version 1.1.0 to 1.1.1
@@ -1,5 +0,7 @@ | ||
var winston = require('winston'); | ||
const winston = require('winston'); | ||
var _ = require('lodash'); | ||
var domain = require('domain'); | ||
const { MESSAGE } = require('triple-beam'); | ||
require('winston-loggly'); | ||
@@ -107,3 +109,3 @@ | ||
parseNamespacesFromEnvironment(); | ||
var logger = new (winston.Logger)(); | ||
var logger = winston.createLogger(); | ||
logger.level = globalOptions.level; | ||
@@ -114,12 +116,11 @@ | ||
if (globalOptions.handleExceptions){ | ||
logger.add(winston.transports.File, { | ||
logger.add(new winston.transports.File( { | ||
filename: globalOptions.filePath, | ||
handleExceptions: true | ||
}); | ||
})); | ||
} | ||
else { | ||
logger.add(winston.transports.File, { | ||
filename: globalOptions.filePath, | ||
json: false | ||
}); | ||
logger.add(new winston.transports.File( { | ||
filename: globalOptions.filePath | ||
})); | ||
} | ||
@@ -130,10 +131,21 @@ } | ||
if (!globalOptions || globalOptions.console){ | ||
if (globalOptions && globalOptions.consoleOptions && globalOptions.consoleOptions.formatter) { | ||
const formatter = { | ||
transform : (info, opts) => { | ||
info.timestamp = () => { return info.time; }; | ||
info[MESSAGE] = globalOptions.consoleOptions.formatter(Object.assign({}, info, opts)); | ||
return info; | ||
} | ||
}; | ||
globalOptions.consoleOptions.format = formatter; | ||
} | ||
if (globalOptions && globalOptions.handleExceptions){ | ||
consoleOptions.handleExceptions = true; | ||
logger.add(winston.transports.Console, globalOptions.consoleOptions); | ||
logger.add(new winston.transports.Console(globalOptions.consoleOptions)); | ||
} | ||
else{ | ||
logger.add( | ||
winston.transports.Console, globalOptions.consoleOptions | ||
new winston.transports.Console(Object.assign({}, globalOptions.consoleOptions)) | ||
); | ||
//logger.configure({transports: [new winston.transports.Console(Object.assign({}, globalOptions.consoleOptions))]}); | ||
} | ||
@@ -144,7 +156,7 @@ } | ||
if (globalOptions && globalOptions.loggly && globalOptions.loggly.subdomain && globalOptions.loggly.inputToken){ | ||
logger.add(winston.transports.Loggly, { | ||
logger.add(new winston.transports.Loggly( { | ||
subdomain: globalOptions.loggly.subdomain, | ||
inputToken: globalOptions.loggly.inputToken, | ||
json: true | ||
}); | ||
})); | ||
} | ||
@@ -151,0 +163,0 @@ |
{ | ||
"name": "cf-logs", | ||
"version": "1.1.0", | ||
"version": "1.1.1", | ||
"description": "codefresh logs", | ||
@@ -19,9 +19,9 @@ "main": "lib/index.js", | ||
"dependencies": { | ||
"lodash": "^3.10.1", | ||
"q": "^1.5.1", | ||
"winston": "2.1.1", | ||
"winston-loggly": "1.2.0" | ||
"lodash": "^4.17.11", | ||
"winston": "3.2.1", | ||
"winston-loggly": "1.3.1" | ||
}, | ||
"devDependencies": { | ||
"chai": "^4.2.0", | ||
"q": "^1.5.1", | ||
"ci-publish": "^1.3.0", | ||
@@ -28,0 +28,0 @@ "eslint": "^3.19.0", |
@@ -176,7 +176,12 @@ var proxyquire = require('proxyquire').noCallThru(); | ||
transports:{ | ||
File: "", | ||
Console: "", | ||
Loggly: "" | ||
File: sinon.spy(), | ||
Console: sinon.spy(), | ||
Loggly: sinon.spy() | ||
}, | ||
Logger: function(){ | ||
format: { | ||
combine: sinon.spy(), | ||
timestamp: sinon.spy(), | ||
printf: sinon.spy() | ||
}, | ||
createLogger: function(){ | ||
return { | ||
@@ -183,0 +188,0 @@ level: "", |
Sorry, the diff of this file is not supported yet
3
685
166075
16
+ Added@colors/colors@1.6.0(transitive)
+ Added@types/triple-beam@1.3.5(transitive)
+ Addedasynckit@0.4.0(transitive)
+ Addedaws4@1.13.2(transitive)
+ Addedbl@1.1.2(transitive)
+ Addedcolor@3.2.1(transitive)
+ Addedcolor-convert@1.9.3(transitive)
+ Addedcolor-name@1.1.3(transitive)
+ Addedcolor-string@1.9.1(transitive)
+ Addedcolornames@1.1.1(transitive)
+ Addedcolorspace@1.1.4(transitive)
+ Addeddiagnostics@1.1.1(transitive)
+ Addedenabled@1.0.2(transitive)
+ Addedenv-variable@0.0.6(transitive)
+ Addedfecha@4.2.3(transitive)
+ Addedform-data@2.0.0(transitive)
+ Addedis-arrayish@0.3.2(transitive)
+ Addedis-stream@1.1.0(transitive)
+ Addedkuler@1.0.1(transitive)
+ Addedlogform@2.7.0(transitive)
+ Addedloggly@1.1.1(transitive)
+ Addedms@2.1.3(transitive)
+ Addedone-time@0.0.4(transitive)
+ Addedpunycode@1.4.1(transitive)
+ Addedqs@6.2.4(transitive)
+ Addedreadable-stream@3.6.2(transitive)
+ Addedrequest@2.75.0(transitive)
+ Addedsafe-buffer@5.2.1(transitive)
+ Addedsafe-stable-stringify@2.5.0(transitive)
+ Addedsimple-swizzle@0.2.2(transitive)
+ Addedstring_decoder@1.3.0(transitive)
+ Addedtext-hex@1.0.0(transitive)
+ Addedtough-cookie@2.3.4(transitive)
+ Addedtriple-beam@1.4.1(transitive)
+ Addedwinston@3.2.1(transitive)
+ Addedwinston-loggly@1.3.1(transitive)
+ Addedwinston-transport@4.9.0(transitive)
- Removedq@^1.5.1
- Removedasync@1.0.0(transitive)
- Removedbl@1.0.3(transitive)
- Removedcolors@1.0.3(transitive)
- Removedcycle@1.0.3(transitive)
- Removedeyes@0.1.8(transitive)
- Removedform-data@1.0.1(transitive)
- Removedlodash@3.10.1(transitive)
- Removedloggly@1.0.9(transitive)
- Removedpkginfo@0.3.1(transitive)
- Removedq@1.5.1(transitive)
- Removedqs@5.2.1(transitive)
- Removedrequest@2.67.0(transitive)
- Removedtough-cookie@2.2.2(transitive)
- Removedwinston@2.1.1(transitive)
- Removedwinston-loggly@1.2.0(transitive)
Updatedlodash@^4.17.11
Updatedwinston@3.2.1
Updatedwinston-loggly@1.3.1