提交 7e106edb 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓)

clean(files): remove brolog-env.ts, move log to config.ts

上级 c389f3a6
/**
* Wechaty - Wechat for Bot
*
* use brolog here is because log in wechaty has to support both nodejs and browser(with electron)
*
*/
// const log = require('npmlog')
import { Brolog } from 'brolog'
const log = Brolog.instance()
const level = process.env['WECHATY_LOG']
// use a typescript switch/case/default: never to replace regex
const levelRegexStr = 'silly|verbose|info|warn|error|silent'
const levelRegex = new RegExp(levelRegexStr, 'i')
if (levelRegex.test(level)) {
log.level(level.toLowerCase())
log.silly('Brolog', 'WECHATY_LOG set level to %s', level)
} else if (level) {
log.warn('Brolog', 'env WECHATY_LOG(%s) must be one of silly|verbose|info|warn|error|silent', level)
}
export { log }
export default log
......@@ -6,8 +6,15 @@
const isCi = require('is-ci')
const isDocker = require('is-docker')
import { log } from 'brolog'
import { Puppet } from './puppet'
import { log } from './brolog-env'
const level = process.env['WECHATY_LOG']
if (level) {
log.level(level.toLowerCase())
log.silly('Brolog', 'WECHATY_LOG set level to %s', level)
}
export type PuppetName = 'web' | 'android' | 'ios'
export type HeadName = 'chrome' | 'phantomjs' | 'firefox'
......@@ -211,10 +218,6 @@ if (!global['WECHATY_CONFIG_INSTANCE_COUNTER']) {
}
global['WECHATY_CONFIG_INSTANCE_COUNTER']++
export {
log,
}
/**
* to handle unhandled exceptions
*/
......@@ -232,4 +235,8 @@ if (/verbose|silly/i.test(logLevel)) {
})
}
export {
log,
}
export default Config
import {
Config,
Sayable,
log,
} from './config'
import {
Message,
......@@ -9,7 +10,6 @@ import {
import { PuppetWeb } from './puppet-web'
import { UtilLib } from './util-lib'
import { Wechaty } from './wechaty'
import { log } from './brolog-env'
export interface ContactObj {
address: string,
......
......@@ -12,7 +12,7 @@
/* tslint:disable:no-var-requires */
const retryPromise = require('retry-promise').default
import log from '../brolog-env'
import { log } from '../config'
import PuppetWeb from './puppet-web'
......
......@@ -19,8 +19,8 @@ const retryPromise = require('retry-promise').default // https://github.com/ola
import {
Config,
HeadName,
log,
} from '../config'
import log from '../brolog-env'
import {
CookieType,
......
......@@ -16,7 +16,7 @@ import * as bodyParser from 'body-parser'
import * as express from 'express'
import { EventEmitter } from 'events'
import log from '../brolog-env'
import { log } from '../config'
export class Server extends EventEmitter {
private express: express.Application
......
......@@ -12,7 +12,7 @@ import * as sinon from 'sinon'
import { Server } from '../../src/puppet-web/'
import UtilLib from '../../src/util-lib'
import log from '../../src/brolog-env'
import { log } from '../../src/config'
test('create & close', async t => {
const port = await UtilLib.getPort(18788)
......
......@@ -11,7 +11,7 @@ import * as sinon from 'sinon'
/* tslint:disable:no-var-requires */
const retryPromise = require('retry-promise').default
import log from '../../src/brolog-env'
import { log } from '../../src/config'
import {
PuppetWeb,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册