From 7e106edbe67538f7140cb6e4a494b539669e006f Mon Sep 17 00:00:00 2001
From: Huan LI <zixia@zixia.net>
Date: Sat, 20 May 2017 19:20:05 +0800
Subject: [PATCH] clean(files): remove brolog-env.ts, move log to config.ts

---
 src/brolog-env.ts                | 24 ------------------------
 src/config.ts                    | 17 ++++++++++++-----
 src/contact.ts                   |  2 +-
 src/puppet-web/bridge.ts         |  2 +-
 src/puppet-web/browser.ts        |  2 +-
 src/puppet-web/server.ts         |  2 +-
 test/puppet-web/server.spec.ts   |  2 +-
 test/puppet-web/watchdog.spec.ts |  2 +-
 8 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 src/brolog-env.ts

diff --git a/src/brolog-env.ts b/src/brolog-env.ts
deleted file mode 100644
index f39d6cd32..000000000
--- a/src/brolog-env.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * 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
diff --git a/src/config.ts b/src/config.ts
index 462ad16b6..fe4a55375 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -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
diff --git a/src/contact.ts b/src/contact.ts
index 9dc003afc..4839ffa20 100644
--- a/src/contact.ts
+++ b/src/contact.ts
@@ -1,6 +1,7 @@
 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,
diff --git a/src/puppet-web/bridge.ts b/src/puppet-web/bridge.ts
index 53b448465..4295e65e4 100644
--- a/src/puppet-web/bridge.ts
+++ b/src/puppet-web/bridge.ts
@@ -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'
 
diff --git a/src/puppet-web/browser.ts b/src/puppet-web/browser.ts
index 4bc5e01c7..fae3bc4f5 100644
--- a/src/puppet-web/browser.ts
+++ b/src/puppet-web/browser.ts
@@ -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,
diff --git a/src/puppet-web/server.ts b/src/puppet-web/server.ts
index 6b31b4097..7f5c2580e 100644
--- a/src/puppet-web/server.ts
+++ b/src/puppet-web/server.ts
@@ -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
diff --git a/test/puppet-web/server.spec.ts b/test/puppet-web/server.spec.ts
index 7a21eeaa9..e9c21acf0 100644
--- a/test/puppet-web/server.spec.ts
+++ b/test/puppet-web/server.spec.ts
@@ -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)
diff --git a/test/puppet-web/watchdog.spec.ts b/test/puppet-web/watchdog.spec.ts
index a955a566d..cf036bff5 100644
--- a/test/puppet-web/watchdog.spec.ts
+++ b/test/puppet-web/watchdog.spec.ts
@@ -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,
-- 
GitLab