Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2288)

Unified Diff: telemetry/telemetry/internal/browser/browser.py

Issue 2992603003: [Telemetry] Do close browser upon exceptions while creating (Closed)
Patch Set: fix issue Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/internal/browser/browser.py
diff --git a/telemetry/telemetry/internal/browser/browser.py b/telemetry/telemetry/internal/browser/browser.py
index bc95edd95e6d0294305bd40975e3fbe64d896c16..acb2fb9c4358eb333cb78560173bd200b95a9bf4 100644
--- a/telemetry/telemetry/internal/browser/browser.py
+++ b/telemetry/telemetry/internal/browser/browser.py
@@ -67,7 +67,7 @@ class Browser(app.App):
'Failed with %s while starting the browser backend.',
exc_info[0].__name__) # Show the exception name only.
try:
- self._platform_backend.WillCloseBrowser(self, self._browser_backend)
+ self.Close()
except Exception:
exception_formatter.PrintFormattedException(
msg='Exception raised while closing platform backend')
@@ -114,6 +114,7 @@ class Browser(app.App):
return extension_dict.ExtensionDict(self._browser_backend.extension_backend)
def _LogBrowserInfo(self):
+ logging.info('Browser started (pid=%s).', self._browser_backend.pid)
logging.info('OS: %s %s',
self._platform_backend.platform.GetOSName(),
self._platform_backend.platform.GetOSVersionName())
@@ -264,6 +265,7 @@ class Browser(app.App):
"""Closes this browser."""
try:
if self._browser_backend.IsBrowserRunning():
+ logging.info('Closing browser (pid=%s) ...', self._browser_backend.pid)
self._platform_backend.WillCloseBrowser(self, self._browser_backend)
self._browser_backend.profiling_controller_backend.WillCloseBrowser()
@@ -274,6 +276,11 @@ class Browser(app.App):
logging.error('Cannot upload browser log: %s' % str(e))
finally:
self._browser_backend.Close()
+ if self._browser_backend.IsBrowserRunning():
+ logging.error(
+ 'Browser is still running (pid=%s).', self._browser_backend.pid)
+ else:
+ logging.info('Browser is closed.')
self.credentials = None
def Foreground(self):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698