Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-02-24 08:39:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

clear UmbraWorker.self._behavior when finished with a page (after the first page, nothing was getting behaviors); bump hard timeout to 20 minutes

Browse Source
This commit is contained in:
Noah Levitt 2014-05-05 18:37:39 -07:00
parent 55fad80553
commit fa6e3eebb2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
umbra/umbra.py
View File

@ -30,7 +30,7 @@ class UmbraWorker:
future, it may keep the browser running indefinitely.)""" future, it may keep the browser running indefinitely.)"""
logger = logging.getLogger('umbra.UmbraWorker') logger = logging.getLogger('umbra.UmbraWorker')
HARD_TIMEOUT_SECONDS = 60 * 15 HARD_TIMEOUT_SECONDS = 20 * 60
def __init__(self, umbra, chrome_port=9222, chrome_exe='chromium-browser', chrome_wait=10, client_id='request'): def __init__(self, umbra, chrome_port=9222, chrome_exe='chromium-browser', chrome_wait=10, client_id='request'):
self.command_id = itertools.count(1) self.command_id = itertools.count(1)
@ -75,6 +75,7 @@ class UmbraWorker:
self.logger.error("exception closing websocket {} - {}".format(self.websock, e)) self.logger.error("exception closing websocket {} - {}".format(self.websock, e))
websock_thread.join() websock_thread.join()
self._behavior = None
def send_to_chrome(self, **kwargs): def send_to_chrome(self, **kwargs):
msg_id = next(self.command_id) msg_id = next(self.command_id)
@ -128,7 +129,7 @@ class UmbraWorker:
else: else:
self.logger.warn("Page.loadEventFired but behaviors already running url={} message={}".format(self.url, message)) self.logger.warn("Page.loadEventFired but behaviors already running url={} message={}".format(self.url, message))
elif "method" in message and message["method"] == "Console.messageAdded": elif "method" in message and message["method"] == "Console.messageAdded":
self.logger.debug("{} console {} {}".format(websock.url, self.logger.debug("{} console.{} {}".format(websock.url,
message["params"]["message"]["level"], message["params"]["message"]["level"],
message["params"]["message"]["text"])) message["params"]["message"]["text"]))
elif "method" in message and message["method"] == "Debugger.paused": elif "method" in message and message["method"] == "Debugger.paused":