Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-04-19 23:35:54 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

more elaborate dumping of state on SIGQUIT to replace faulthandler

Browse Source
This commit is contained in:
Noah Levitt 2014-06-20 14:05:33 -07:00
parent ebb14ff889
commit ead46d5716
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bin/umbra
View File

@ -11,11 +11,10 @@ import os
import umbra
import signal
import threading
import traceback
import pprint
if __name__=="__main__":
import faulthandler
faulthandler.register(signal.SIGQUIT)
if __name__ == "__main__":
arg_parser = argparse.ArgumentParser(prog=os.path.basename(__file__),
description='umbra - browser automation tool communicating via AMQP',
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@ -44,6 +43,35 @@ if __name__=="__main__":
max_active_browsers=int(args.max_browsers),
exchange_name=args.amqp_exchange, queue_name=args.amqp_queue)
def dump_browser(b):
pprint.pprint(b.__dict__, indent=4)
if b._chrome_instance:
print("=> {} chrome instance:".format(b))
pprint.pprint(b._chrome_instance.__dict__, indent=4)
if b._behavior:
print("=> {} active behavior:".format(b))
pprint.pprint(b._behavior.__dict__, indent=4)
def dump_state(signum, frame):
logging.warn("dumping state (caught signal {})".format(signum))
for th in threading.enumerate():
print(th)
traceback.print_stack(sys._current_frames()[th.ident])
print()
print("umbra controller:")
pprint.pprint(controller.__dict__, indent=4)
print()
for b in controller._browser_pool._in_use:
print("{} (in use):".format(b))
dump_browser(b)
print()
for b in controller._browser_pool._available:
print("{} (not in use):".format(b))
dump_browser(b)
print()
signal.signal(signal.SIGQUIT, dump_state)
class ShutdownRequested(Exception):
pass

11
umbra/browser.py
View File

@ -68,6 +68,7 @@ class Browser:
self._behavior = None
self._websock = None
self._abort_browse_page = False
self._chrome_instance = None
def __repr__(self):
return "{}.{}:{}".format(Browser.__module__, Browser.__qualname__, self.chrome_port)
@ -110,7 +111,7 @@ class Browser:
''.join((random.choice('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') for _ in range(6))))
websock_thread = threading.Thread(target=self._websock.run_forever, name=threadName, kwargs={'ping_timeout':0.5})
websock_thread.start()
start = time.time()
self._start = time.time()
aborted = False
try:
@ -118,7 +119,7 @@ class Browser:
time.sleep(0.5)
if not self._websock or not self._websock.sock or not self._websock.sock.connected:
raise BrowsingException("websocket closed, did chrome die? {}".format(self._websocket_url))
elif time.time() - start > Browser.HARD_TIMEOUT_SECONDS:
elif time.time() - self._start > Browser.HARD_TIMEOUT_SECONDS:
self.logger.info("finished browsing page, reached hard timeout of {} seconds url={}".format(Browser.HARD_TIMEOUT_SECONDS, self.url))
return
elif self._behavior != None and self._behavior.is_finished():
@ -237,7 +238,7 @@ class Chrome:
self.logger.info("running {}".format(chrome_args))
self.chrome_process = subprocess.Popen(chrome_args, env=new_env, start_new_session=True)
self.logger.info("chrome running, pid {}".format(self.chrome_process.pid))
start = time.time()
self._start = time.time() # member variable just so that kill -QUIT reports it
json_url = "http://localhost:%s/json" % self.port
@ -255,8 +256,8 @@ class Chrome:
except:
pass
finally:
if time.time() - start > timeout_sec:
raise Exception("failed to retrieve {} after {} seconds".format(json_url, time.time() - start))
if time.time() - self._start > timeout_sec:
raise Exception("failed to retrieve {} after {} seconds".format(json_url, time.time() - self._start))
else:
time.sleep(0.5)