Handle more socket exceptions (DataDog#349)

* Handle all exceptions

* Change log levels and increase max line for tests

* Add lock to address threading issues

* Remove conversion to str

Co-Authored-By: dabcoder <david.bouchare@datadoghq.com>

Author: David Bouchare

datadog/dogstatsd/base.py

@@ -7,6 +7,7 @@
 import logging
 import os
 import socket
+from threading import Lock
 
 # datadog
 from datadog.dogstatsd.context import TimedContextManagerDecorator
@@ -59,6 +60,8 @@ def __init__(self, host='localhost', port=8125, max_buffer_size=50, namespace=No
         :type socket_path: string
         """
 
+        self.lock = Lock()
+
         # Connection
         if socket_path is not None:
             self.socket_path = socket_path
@@ -114,16 +117,17 @@ def get_socket(self):
         Note: connect the socket before assigning it to the class instance to
         avoid bad thread race conditions.
         """
-        if not self.socket:
-            if self.socket_path is not None:
-                sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
-                sock.connect(self.socket_path)
-                sock.setblocking(0)
-                self.socket = sock
-            else:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                sock.connect((self.host, self.port))
-                self.socket = sock
+        with self.lock:
+            if not self.socket:
+                if self.socket_path is not None:
+                    sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
+                    sock.connect(self.socket_path)
+                    sock.setblocking(0)
+                    self.socket = sock
+                else:
+                    sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+                    sock.connect((self.host, self.port))
+                    self.socket = sock
 
         return self.socket
 
@@ -289,9 +293,12 @@ def _send_to_server(self, packet):
         except socket.timeout:
             # dogstatsd is overflowing, drop the packets (mimicks the UDP behaviour)
             return
-        except socket.error:
-            log.info("Error submitting packet, dropping the packet and closing the socket")
+        except (socket.error, socket.herror, socket.gaierror) as se:
+            log.warning("Error submitting packet: {}, dropping the packet and closing the socket".format(se))
             self.close_socket()
+        except Exception as e:
+            log.error("Unexpected error: %s", str(e))
+            return
 
     def _send_to_buffer(self, packet):
         self.buffer.append(packet)

tox.ini

@@ -22,4 +22,4 @@ deps =
 commands = flake8 datadog
 
 [flake8]
-max-line-length = 100
+max-line-length = 120