ts_mon: catch more PubSub errors from socket.

infra_libs/ts_mon/common/monitors.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.
 
 """Classes representing the monitoring interface for tasks or devices."""
 
 
 import base64
 import json
 import logging
+import socket
 import traceback
 
 from googleapiclient import discovery
 from googleapiclient import errors
 from oauth2client import gce
 from oauth2client.client import GoogleCredentials
 from oauth2client.file import Storage
 import httplib2
 
 from infra_libs import httplib2_utils
@@ skipping 134 matching lines @@
         ],
     }
     # Occasionally, client fails to receive a proper internal JSON
     # from the server and raises ValueError trying to parse it.  Other
     # times we may fail with a network error. This is not fatal, we'll
     # resend metrics next time.
     try:
       self._api.projects().topics().publish(
           topic=self._topic,
           body=body).execute(num_retries=5)
-    except (ValueError, errors.Error):
+    except (ValueError, errors.Error,
+            socket.timeout, socket.error, socket.herror, socket.gaierror,
+            httplib2.HttpLib2Error):
       # Log a warning, not error, to avoid false alarms in AppEngine apps.
       logging.warning('PubSubMonitor.send failed:\n%s',
                       traceback.format_exc())
 
 
 class DebugMonitor(Monitor):
   """Class which writes metrics to logs or a local file for debugging."""
   def __init__(self, filepath=None):
     if filepath is None:
       self._fh = None
     else:
       self._fh = open(filepath, 'a')
 
   def send(self, metric_pb):
     text = str(self._wrap_proto(metric_pb))
     logging.info('Flushing monitoring metrics:\n%s', text)
     if self._fh is not None:
       self._fh.write(text + '\n\n')
       self._fh.flush()
 
 
 class NullMonitor(Monitor):
   """Class that doesn't send metrics anywhere."""
   def send(self, metric_pb):
     pass