From 9c96a6a184f5eece6ff918e417482a1efa7ccd83 Mon Sep 17 00:00:00 2001 From: Huan LI Date: Sun, 30 Apr 2017 20:09:05 +0800 Subject: [PATCH] fix(brolog) follow Brolog v1.0 --- src/brolog-env.ts | 17 ++++++----------- src/io-client.ts | 8 +++++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/brolog-env.ts b/src/brolog-env.ts index 6309e09a..009ab006 100644 --- a/src/brolog-env.ts +++ b/src/brolog-env.ts @@ -5,9 +5,7 @@ * */ // const log = require('npmlog') -import { Brolog } from 'brolog' - -export let log: Brolog +import log from 'brolog' const level = process.env['WECHATY_LOG'] @@ -16,14 +14,11 @@ const levelRegexStr = 'silly|verbose|info|warn|error|silent' const levelRegex = new RegExp(levelRegexStr, 'i') if (levelRegex.test(level)) { // log.level = level.toLowerCase() - log = new Brolog(level) + log.level(level) log.silly('Brolog', 'WECHATY_LOG set level to %s', level) -} else { - log = new Brolog() - if (level) { - log.warn('Brolog', 'env WECHATY_LOG(%s) must be one of silly|verbose|info|warn|error|silent', level) - } +} else if (level) { + log.warn('Brolog', 'env WECHATY_LOG(%s) must be one of silly|verbose|info|warn|error|silent', level) } -export { Brolog } -export default Brolog +export { log } +export default log diff --git a/src/io-client.ts b/src/io-client.ts index 7a197122..29539afc 100644 --- a/src/io-client.ts +++ b/src/io-client.ts @@ -16,11 +16,13 @@ */ // import Brolog from 'brolog' -import { Config } from './config' +import { + Config, + log as globalLog, +} from './config' import { Io } from './io' import { StateMonitor } from './state-monitor' import { Wechaty } from './wechaty' -import { Brolog } from './brolog-env' export class IoClient { @@ -31,7 +33,7 @@ export class IoClient { constructor( private token: string = Config.token || Config.DEFAULT_TOKEN, - private log: any = new Brolog(), + private log: any = globalLog, ) { if (!log) { const e = new Error('constructor() log(npmlog/brolog) must be set') -- GitLab