Merge branch 'master' into version-3.x

This commit is contained in:
Gareth Jones 2018-06-04 08:03:21 +10:00
commit 803e53ff71
4 changed files with 4 additions and 4 deletions

View File

@ -7,7 +7,7 @@ log4js.configure({
});
const logger = log4js.getLogger('cheese');
logger.setLevel('ERROR');
logger.level = 'ERROR';
logger.trace('Entering cheese testing');
logger.debug('Got cheese.');

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "log4js",
"version": "2.7.0",
"version": "2.8.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "log4js",
"version": "2.7.0",
"version": "2.8.0",
"description": "Port of Log4js to work with node.",
"homepage": "https://log4js-node.github.io/log4js-node/",
"files": [

2
types/log4js.d.ts vendored
View File

@ -368,7 +368,7 @@ export interface Configuration {
disableClustering?: boolean;
}
export interface Logger {
export class Logger {
new(dispatch: Function, name: string): Logger;
level: string;