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

even more patience killing chrome, send another sigterms every ten seconds if chrome is still alive

Browse Source
This commit is contained in:
Noah Levitt 2014-06-02 12:09:15 -07:00
parent c6bd2417d7
commit 1f91018d91
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
umbra/browser.py
View File

@ -230,9 +230,13 @@ class Chrome:
def __exit__(self, *args):
timeout_sec = 60
self.logger.info("terminating chrome pid {}".format(self.chrome_process.pid))
self.chrome_process.terminate()
start = time.time()
while time.time() - start < timeout_sec:
first_sigterm = last_sigterm = time.time()
while time.time() - first_sigterm < timeout_sec:
time.sleep(0.5)
status = self.chrome_process.poll()
if status is not None:
if status == 0:
@ -240,7 +244,11 @@ class Chrome:
else:
self.logger.warn("chrome pid {} exited with nonzero status {}".format(self.chrome_process.pid, status))
return
time.sleep(0.5)
# sometimes a hung chrome process will terminate on repeated sigterms
if time.time() - last_sigterm > 10:
self.chrome_process.terminate()
last_sigterm = time.time()
self.logger.warn("chrome pid {} still alive {} seconds after sending SIGTERM, sending SIGKILL".format(self.chrome_process.pid, timeout_sec))
self.chrome_process.kill()