Merge branch 'master' into qa

* master:
  do a better job of making sure to shut down the browser when brozzle-page is killed
This commit is contained in:
Noah Levitt 2017-05-03 16:43:38 -07:00
commit 0c45ca2211
2 changed files with 2 additions and 2 deletions

View File

@ -179,8 +179,8 @@ def brozzle_page(argv=None):
logging.info('wrote screenshot to %s', filename)
browser = brozzler.Browser(chrome_exe=args.chrome_exe)
browser.start(proxy=args.proxy)
try:
browser.start(proxy=args.proxy)
outlinks = worker.brozzle_page(
browser, site, page, on_screenshot=on_screenshot)
logging.info('outlinks: \n\t%s', '\n\t'.join(sorted(outlinks)))

View File

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.1b11.dev243',
version='1.1b11.dev244',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',