diff --git a/index.js b/index.js index 6757497..9e0e797 100644 --- a/index.js +++ b/index.js @@ -66,11 +66,7 @@ process.on('SIGTERM', exitHandler.bind(null, { cleanup: true })); */ app.post('/', async (req, res, next) => { browser.get(req.body).then(html => res.send(html)).catch(e => { - if (e instanceof NoSuchSessionError) { - logger.error({ reason: e.message, url: req.url }, 'Browser session expired') - } else { - logger.error(Object.assign({ message: e.message }, { info: e.info }), 'Browser error occured') - } + logger.error({ message: e.message, info: e.info }, 'Browser error') res.status(500).send({ code: 500, message: e.message }) }) }) diff --git a/src/component/SeleniumBrowser.js b/src/component/SeleniumBrowser.js index 78a2174..bf7c5ec 100644 --- a/src/component/SeleniumBrowser.js +++ b/src/component/SeleniumBrowser.js @@ -21,10 +21,8 @@ class SeleniumBrowser { .then(() => driver.findElement(By.css('body'))) .then(body => body.getAttribute('innerHTML')) .catch(e => { - if (e instanceof NoSuchSessionError) { - this.pool.destroy(driver) - throw new NoSuchSessionError - } + this.pool.destroy(driver) + throw new Error(e.message) }) let p = captcha.isCaptchaPage(html) ? captcha.resolveCaptcha(driver, this.pool) : this.getHtml(driver, html, params) html = await p