add timeout for server connection (#22)

Author: Froger David

pymonetdb/control.py

@@ -70,7 +70,7 @@ class Control:
     stop, lock, unlock, destroy your databases and request status information.
     """
     def __init__(self, hostname=None, port=50000, passphrase=None,
-                 unix_socket=None):
+                 unix_socket=None, connect_timeout=-1):
 
         if not unix_socket:
             unix_socket = "/tmp/.s.merovingian.%i" % port
@@ -83,19 +83,22 @@ def __init__(self, hostname=None, port=50000, passphrase=None,
         self.port = port
         self.passphrase = passphrase
         self.unix_socket = unix_socket
+        self.connect_timeout = connect_timeout
 
         # check connection
         self.server.connect(hostname=hostname, port=port, username='monetdb',
                             password=passphrase,
                             database='merovingian', language='control',
-                            unix_socket=unix_socket)
+                            unix_socket=unix_socket,
+                            connect_timeout=connect_timeout)
         self.server.disconnect()
 
     def _send_command(self, database_name, command):
         self.server.connect(hostname=self.hostname, port=self.port,
                             username='monetdb', password=self.passphrase,
                             database='merovingian', language='control',
-                            unix_socket=self.unix_socket)
+                            unix_socket=self.unix_socket,
+                            connect_timeout=self.connect_timeout)
         try:
             return self.server.cmd("%s %s\n" % (database_name, command))
         finally:

pymonetdb/mapi.py

@@ -100,9 +100,10 @@ def __init__(self):
         self.password = ""
         self.database = ""
         self.language = ""
+        self.connect_timeout = socket.getdefaulttimeout()
 
     def connect(self, database, username, password, language, hostname=None,
-                port=None, unix_socket=None):
+                port=None, unix_socket=None, connect_timeout=-1):
         """ setup connection to MAPI server
 
         unix_socket is used if hostname is not defined.
@@ -116,6 +117,11 @@ def connect(self, database, username, password, language, hostname=None,
         elif not hostname:
             hostname = 'localhost'
 
+        # None and zero are allowed values
+        if connect_timeout != -1:
+            assert connect_timeout is None or connect_timeout >= 0
+            self.connect_timeout = connect_timeout
+
         self.hostname = hostname
         self.port = port
         self.username = username
@@ -129,9 +135,11 @@ def connect(self, database, username, password, language, hostname=None,
             # For performance, mirror MonetDB/src/common/stream.c socket settings.
             self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 0)
             self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+            self.socket.settimeout(self.connect_timeout)
             self.socket.connect((hostname, port))
         else:
             self.socket = socket.socket(socket.AF_UNIX)
+            self.socket.settimeout(self.connect_timeout)
             self.socket.connect(unix_socket)
             if self.language != 'control':
                 # don't know why, but we need to do this
@@ -141,6 +149,7 @@ def connect(self, database, username, password, language, hostname=None,
             # control doesn't require authentication over socket
             self._login()
 
+        self.socket.settimeout(socket.getdefaulttimeout())
         self.state = STATE_READY
 
     def _login(self, iteration=0):

pymonetdb/sql/connections.py

@@ -20,7 +20,7 @@ class Connection(object):
 
     def __init__(self, database, hostname=None, port=50000, username="monetdb",
                  password="monetdb", unix_socket=None, autocommit=False,
-                 host=None, user=None):
+                 host=None, user=None, connect_timeout=-1):
         """ Set up a connection to a MonetDB SQL database.
 
         args:
@@ -32,6 +32,8 @@ def __init__(self, database, hostname=None, port=50000, username="monetdb",
             unix_socket (str): socket to connect to. used when hostname not set
                                 (default: "/tmp/.s.monetdb.50000")
             autocommit (bool):  enable/disable auto commit (default: False)
+            connect_timeout -- the socket timeout while connecting
+                               (default: see python socket module)
 
         returns:
             Connection object
@@ -50,7 +52,7 @@ def __init__(self, database, hostname=None, port=50000, username="monetdb",
         self.mapi = mapi.Connection()
         self.mapi.connect(hostname=hostname, port=int(port), username=username,
                           password=password, database=database, language="sql",
-                          unix_socket=unix_socket)
+                          unix_socket=unix_socket, connect_timeout=connect_timeout)
         self.set_autocommit(autocommit)
         self.set_sizeheader(True)
         self.set_replysize(100)