commit 1c0fe8bb5099e9d9334420ec13bfaf5479857f7d
author Chris Ching <chingcodes@chromium.org> Thu Jun 01 15:29:16 2017 -0600
committer chrome-bot <chrome-bot@chromium.org> Fri Jun 02 15:11:21 2017 -0700
tree 2f0169f1dd0509562e78009f9404ed6a2a004bbe
parent 875dca69667ccccadbf6fa7dc4dbb47e7075f984

rpc_flight_recorder: fix exception handling

BUG=chromium:715386
TEST=run locally

Change-Id: I90b54431a80108e960c5f6cd696d6f8b51fcb4b2
Reviewed-on: https://chromium-review.googlesource.com/522886
Commit-Ready: Chris Ching <chingcodes@chromium.org>
Tested-by: Chris Ching <chingcodes@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>

site_utils/rpc_flight_recorder.py

diff --git a/site_utils/rpc_flight_recorder.py b/site_utils/rpc_flight_recorder.py
index 9ad41d6..25e8ca8 100755
--- a/site_utils/rpc_flight_recorder.py
+++ b/site_utils/rpc_flight_recorder.py
@@ -37,9 +37,9 @@
     try:
         afe_monitor.run()
     except Exception as e:
-        with metrics.Counter(METRIC_MONITOR_ERROR).increment(
-                fields={'target_hostname': hostname}):
-            logging.exception(e)
+        metrics.Counter(METRIC_MONITOR_ERROR).increment(
+                fields={'target_hostname': hostname})
+        logging.exception(e)
 
 
 class RpcFlightRecorder(object):
@@ -107,7 +107,7 @@
                 logging.warning("%s:%s:failed - %s", self._hostname, cmd,
                         f['failure_reason'])
             except Exception as e:
-                f['failure_reason'] = FAILURE_REASONS.get(type(e), 'Uknown')
+                f['failure_reason'] = FAILURE_REASONS.get(type(e), 'Unknown')
                 logging.warning("%s:%s:failed - %s",
                                 self._hostname,
                                 cmd,