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

code clean

上级 ed1ffa0d
...@@ -7,6 +7,7 @@ import { execSync } from 'child_process' ...@@ -7,6 +7,7 @@ import { execSync } from 'child_process'
import * as fs from 'fs' import * as fs from 'fs'
import Puppet from './puppet' import Puppet from './puppet'
import log from './brolog-env'
export type PuppetName = 'web' | 'android' | 'ios' export type PuppetName = 'web' | 'android' | 'ios'
export type HeadName = 'chrome' | 'phantomjs' | 'firefox' export type HeadName = 'chrome' | 'phantomjs' | 'firefox'
...@@ -132,9 +133,11 @@ function isWechatyDocker() { ...@@ -132,9 +133,11 @@ function isWechatyDocker() {
function puppetInstance(instance?: Puppet | null): Puppet | void { function puppetInstance(instance?: Puppet | null): Puppet | void {
if (instance !== undefined) { if (instance !== undefined) {
if (instance) { if (instance) {
log.verbose('Config', 'puppetInstance(%s)', instance.constructor.name)
Config._puppetInstance = instance Config._puppetInstance = instance
return instance return instance
} }
log.verbose('Config', 'puppetInstance(null)')
Config._puppetInstance = null Config._puppetInstance = null
return return
} }
...@@ -142,6 +145,7 @@ function puppetInstance(instance?: Puppet | null): Puppet | void { ...@@ -142,6 +145,7 @@ function puppetInstance(instance?: Puppet | null): Puppet | void {
if (!Config._puppetInstance) { if (!Config._puppetInstance) {
throw new Error('no puppet instance') throw new Error('no puppet instance')
} }
return Config._puppetInstance return Config._puppetInstance
} }
...@@ -179,6 +183,5 @@ export interface Sleepable { ...@@ -179,6 +183,5 @@ export interface Sleepable {
sleep(millisecond: number): Promise<void> sleep(millisecond: number): Promise<void>
} }
export * from './brolog-env' export { log }
export default Config export default Config
...@@ -122,8 +122,6 @@ export class Contact implements Sayable { ...@@ -122,8 +122,6 @@ export class Contact implements Sayable {
} }
if (!contactGetter) { if (!contactGetter) {
if (!Config.puppetInstance()) { throw new Error('Config.puppetInstance() is not found by Contact') }
log.silly('Contact', 'get contact via ' + Config.puppetInstance().constructor.name) log.silly('Contact', 'get contact via ' + Config.puppetInstance().constructor.name)
contactGetter = Config.puppetInstance() contactGetter = Config.puppetInstance()
.getContact.bind(Config.puppetInstance()) .getContact.bind(Config.puppetInstance())
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册