Merge pull request #20 from crovner/master

Allow connected_socket() to use custom timeout

Author: unixsurfer

haproxyadmin/haproxy.py

@@ -112,10 +112,10 @@ def __init__(self,
                                  "{}".format(socket_dir))
 
             for _file in glob.glob(os.path.join(socket_dir, '*')):
-                if is_unix_socket(_file) and connected_socket(_file):
+                if is_unix_socket(_file) and connected_socket(_file, timeout):
                     socket_files.append(_file)
         elif (socket_file and is_unix_socket(socket_file) and
-              connected_socket(socket_file)):
+              connected_socket(socket_file, timeout)):
             socket_files.append(os.path.realpath(socket_file))
         else:
             raise ValueError("UNIX socket file was not set")

haproxyadmin/utils.py

@@ -158,7 +158,7 @@ def is_unix_socket(path):
 
     return stat.S_ISSOCK(mode)
 
-def connected_socket(path):
+def connected_socket(path, timeout):
     """Check if socket file is a valid HAProxy socket file.
 
     We send a 'show info' command to the socket, build a dictionary structure
@@ -167,13 +167,15 @@ def connected_socket(path):
 
     :param path: file name path
     :type path: ``string``
+    :param timeout: timeout for the connection, in seconds
+    :type timeout: ``float``
     :return: ``True`` is socket file is a valid HAProxy stats socket file False
       otherwise
     :rtype: ``bool``
     """
     try:
         unix_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        unix_socket.settimeout(0.1)
+        unix_socket.settimeout(timeout)
         unix_socket.connect(path)
         unix_socket.send(six.b('show info' + '\n'))
         file_handle = unix_socket.makefile()