ts_mon: catch more PubSub errors from socket.

infra_libs/httplib2_utils.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import json
 import logging
 import os
 import re
@@ skipping 181 matching lines @@
       request_bytes = len(body)
     http_metrics.request_bytes.add(request_bytes, fields=self.fields)
 
     start_time = self.time_fn()
     try:
       response, content = super(InstrumentedHttp, self).request(
           uri, method, body, *args, **kwargs)
     except socket.timeout:
       self._update_metrics(http_metrics.STATUS_TIMEOUT, start_time)
       raise
-    except socket.error:
+    except (socket.error, socket.herror, socket.gaierror):
       self._update_metrics(http_metrics.STATUS_ERROR, start_time)
       raise
     except httplib2.HttpLib2Error:
       self._update_metrics(http_metrics.STATUS_EXCEPTION, start_time)
       raise
     http_metrics.response_bytes.add(len(content), fields=self.fields)
 
     self._update_metrics(response.status, start_time)
 
     return response, content
@@ skipping 44 matching lines @@
     self.requests_made.append(self.HttpCall(uri, method, body, headers))
     headers = None
     body = None
     for candidate in self._uris:
       if candidate[0].match(uri):
         _, headers, body = candidate
         break
     if not headers:
       raise AssertionError("Unexpected request to %s" % uri)
     return httplib2.Response(headers), body