diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-30 15:41:29 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-30 15:41:29 +0000 |
| commit | f3b7b9b4faf2a4eaed4ea48281a97d60d9049e4c (patch) | |
| tree | b4ca46f586a2680538b625052eb8bc29ee1505f7 /tools/telemetry | |
| parent | 2542d88ac804d6d628c87f74f3f5e77a53aacd2c (diff) | |
| download | chromium_src-f3b7b9b4faf2a4eaed4ea48281a97d60d9049e4c.zip chromium_src-f3b7b9b4faf2a4eaed4ea48281a97d60d9049e4c.tar.gz chromium_src-f3b7b9b4faf2a4eaed4ea48281a97d60d9049e4c.tar.bz2 | |
Telemetry: expands websocket exception handling.
Some downstream bots are printing hundreds of:
WARNING:root:Timeout waiting for tracing response, unusual.
The actual underlying exception is websocket.WebSocketConnectionClosedException
Retry only on timeout, but raise on any more generic exception.
BUG=
Review URL: https://codereview.chromium.org/25059002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/tracing_backend.py | 9 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/websocket.py | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend.py b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend.py index f080280..2c40f60 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend.py @@ -213,8 +213,13 @@ class TracingBackend(object): logging.warning('Unexpected type in tracing data') elif 'Tracing.tracingComplete' == res.get('method'): break - except (socket.error, websocket.WebSocketException): - logging.warning('Timeout waiting for tracing response, unusual.') + except websocket.WebSocketTimeoutException as e: + logging.warning('Unusual timeout waiting for tracing response (%s).', + e) + except (socket.error, websocket.WebSocketException) as e: + logging.warning('Unrecoverable exception when reading tracing response ' + '(%s, %s).', type(e), e) + raise def Close(self): self._conn.Close() diff --git a/tools/telemetry/telemetry/core/backends/chrome/websocket.py b/tools/telemetry/telemetry/core/backends/chrome/websocket.py index 34defe4..f70426e 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/websocket.py +++ b/tools/telemetry/telemetry/core/backends/chrome/websocket.py @@ -9,3 +9,4 @@ util.AddDirToPythonPath( util.GetTelemetryDir(), 'third_party', 'websocket-client') from websocket import create_connection # pylint: disable=W0611 from websocket import WebSocketException # pylint: disable=W0611 +from websocket import WebSocketTimeoutException # pylint: disable=W0611 |