diff --git a/config/index.js b/config/index.js index 2e8937e..eeb0633 100644 --- a/config/index.js +++ b/config/index.js @@ -36,12 +36,14 @@ class Config { finalize() { if (this.options.env == 'development') { this.options.level = this.options.level ? this.options.level : "DEBUG" - logger.format = logger.formatters.dev; + logger.formatters.dev.omit = ['pid', 'port', 'hostname', 'app']; + // logger.format = logger.formatters.dev; } else { this.options.level = this.options.level ? this.options.level : "WARN" } + logger.formatters.json.omit = ['pid', 'port', 'hostname', 'app']; logger.setLevel(this.options.level) - logger.info('Environment setting options', this.options) + logger.debug(this.options, 'Environment setting options') } validate() { diff --git a/src/component/PuppeteerBrowser.js b/src/component/PuppeteerBrowser.js index 701930a..1de7bbf 100644 --- a/src/component/PuppeteerBrowser.js +++ b/src/component/PuppeteerBrowser.js @@ -120,10 +120,10 @@ class PuppeteerBrowser { return await this.getHtml(page, url) }); - logger.info('Cluster initialized %j', { cluster: this.getClsuterInfo() }) + logger.debug({ cluster: this.getClsuterInfo() }, 'Cluster initialized') } this.cluster.queue(url); - logger.info('Add queue url(%s) cluster updated : %j', url, { cluster: this.getClsuterInfo() }) + logger.debug({ url: url, cluster: this.getClsuterInfo() }, 'Add url to queue cluster updated') return this.cluster.execute(url); } diff --git a/src/component/SeleniumBrowser.js b/src/component/SeleniumBrowser.js index ade850f..ed03c45 100644 --- a/src/component/SeleniumBrowser.js +++ b/src/component/SeleniumBrowser.js @@ -72,7 +72,7 @@ class SeleniumBrowser { let requestUrl = new url.URL('https://2captcha.com/in.php') requestUrl.search = new url.URLSearchParams(captcha2Params).toString(); fetch(requestUrl).then(res => res.json()).then(res => { - logger.info('2captcha IN-request response : %j', res) + logger.debug(res, '2captcha IN-request response') if (!res.hasOwnProperty('request')) { throw new Error('2captcha IN-request response has no data request id : ' + JSON.stringify(res)) } @@ -84,7 +84,7 @@ class SeleniumBrowser { } while (res.request == 'CAPCHA_NOT_READY') return res }).then(res => { - logger.info('2captcha solved : %j', res) + logger.debug(res, '2captcha solved') // this.driver.findElement(By.css('#g-recaptcha-response')).setAttribute('innerHTML', res.request) this.driver.executeScript('captchaCallback("' + res.request + '")') this.driver.wait(10000).then(d => {