egg-logger
Advanced tools
Comparing version 2.8.0 to 2.9.0
@@ -26,2 +26,3 @@ 'use strict'; | ||
concentrateError: 'duplicate', | ||
concentrateErrorLoggerName: 'errorLogger', | ||
}; | ||
@@ -53,3 +54,4 @@ | ||
* - {String} eol - end of line char | ||
* - {String} [concentrateError = duplicate] - whether write error logger to common-error.log, `duplicate` / `redirect` / `ignore` | ||
* - {String} [concentrateError = duplicate] - whether write error logger to `concentrateErrorLoggerName` logger, `duplicate` / `redirect` / `ignore` | ||
* - {String} [concentrateErrorLoggerName = errorLogger] - concentrate logger name | ||
* - customLogger | ||
@@ -76,23 +78,23 @@ */ | ||
let coreLogger; | ||
let logger; | ||
if (loggerConfig.type === 'agent') { | ||
const logger = new Logger(utils.assign({}, loggerConfig, { | ||
logger = new Logger(utils.assign({}, loggerConfig, { | ||
file: loggerConfig.agentLogName, | ||
})); | ||
this.set('logger', logger); | ||
const coreLogger = new Logger(utils.assign({}, loggerConfig, loggerConfig.coreLogger, { | ||
coreLogger = new Logger(utils.assign({}, loggerConfig, loggerConfig.coreLogger, { | ||
file: loggerConfig.agentLogName, | ||
})); | ||
this.set('coreLogger', coreLogger); | ||
} else { | ||
const logger = new Logger(utils.assign({}, loggerConfig, { | ||
logger = new Logger(utils.assign({}, loggerConfig, { | ||
file: loggerConfig.appLogName, | ||
})); | ||
this.set('logger', logger); | ||
const coreLogger = new Logger(utils.assign({}, loggerConfig, loggerConfig.coreLogger, { | ||
coreLogger = new Logger(utils.assign({}, loggerConfig, loggerConfig.coreLogger, { | ||
file: loggerConfig.coreLogName, | ||
})); | ||
this.set('coreLogger', coreLogger); | ||
} | ||
this.set('logger', logger); | ||
this.set('coreLogger', coreLogger); | ||
@@ -103,2 +105,9 @@ for (const name in customLoggerConfig) { | ||
} | ||
// setConcentrateError at the end | ||
this.setConcentrateError('logger', logger); | ||
this.setConcentrateError('coreLogger', coreLogger); | ||
for (const name in customLoggerConfig) { | ||
this.setConcentrateError(name, this.get(name)); | ||
} | ||
} | ||
@@ -131,10 +140,18 @@ | ||
this[name] = logger; | ||
super.set(name, logger); | ||
} | ||
setConcentrateError(name, logger) { | ||
// redirect ERROR log to errorLogger, except errorLogger itself | ||
if (name !== 'errorLogger') { | ||
const concentrateLogger = this.get(logger.options.concentrateErrorLoggerName); | ||
if (!concentrateLogger) return; | ||
switch (logger.options.concentrateError) { | ||
case 'duplicate': | ||
logger.duplicate('error', this.errorLogger, { excludes: [ 'console' ] }); | ||
logger.duplicate('error', concentrateLogger, { excludes: [ 'console' ] }); | ||
break; | ||
case 'redirect': | ||
logger.redirect('error', this.errorLogger); | ||
logger.redirect('error', concentrateLogger); | ||
break; | ||
@@ -147,4 +164,2 @@ case 'ignore': | ||
} | ||
this[name] = logger; | ||
super.set(name, logger); | ||
} | ||
@@ -151,0 +166,0 @@ |
{ | ||
"name": "egg-logger", | ||
"version": "2.8.0", | ||
"version": "2.9.0", | ||
"description": "egg logger", | ||
@@ -63,3 +63,3 @@ "main": "index.js", | ||
"ci": { | ||
"version": "8, 10, 12, 14, 16", | ||
"version": "8, 10, 12, 14, 16, 18", | ||
"type": "github", | ||
@@ -66,0 +66,0 @@ "os": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1266
51354
19