Make refresh before request

Remove useless reconnect kwarg. Some test clean up
Fix compat with init mesh builder
Fix compat Mesh class with original Connection
Fixed variables names.
Reworked strategy class.
Reorked and added tests.
Some small cleanup.
Make validation parts.
Add warning on config validation.
Make cluster discovery after connect
Add reconnect to refresh.
More tests

Author: denis-ignatenko

README.rst

@@ -88,11 +88,10 @@ How to use the connector
     con = tarantool.Connection(host='localhost',
                                port=3301,
                                user='test',
-                               password='test',
-                               connect_now=True)
+                               password='test')
 
 
-    resp = con.eval('return "Hello Wrold!"')
+    resp = con.eval('return "Hello World!"')
     if resp.data[0] == "Hello World!":
         print('Ok')
 

tarantool/__init__.py

@@ -51,19 +51,19 @@ def connect(host="localhost", port=33013, user=None, password=None,
                       encoding=encoding)
 
 
-def connectmesh(addrs=({'host': 'localhost', 'port': 3301},), user=None,
+def connectmesh(addresses=({'host': 'localhost', 'port': 3301},), user=None,
                 password=None, encoding=ENCODING_DEFAULT):
     '''
     Create a connection to the mesh of Tarantool servers.
 
-    :param list addrs: A list of maps: {'host':(HOSTNAME|IP_ADDR), 'port':PORT}.
+    :param list addesses: A list of maps: {'host':(HOSTNAME|IP_ADDR), 'port':PORT}.
 
     :rtype: :class:`~tarantool.mesh_connection.MeshConnection`
 
     :raise: `NetworkError`
     '''
 
-    return MeshConnection(addrs=addrs,
+    return MeshConnection(addresses=addresses,
                           user=user,
                           password=password,
                           socket_timeout=SOCKET_TIMEOUT,

tarantool/connection.py

@@ -126,19 +126,19 @@ def __init__(self, host, port,
         self.encoding = encoding
         self.call_16 = call_16
         self.connection_timeout = connection_timeout
-        self.authenticated = False
         if connect_now:
             self.connect()
 
     def close(self):
         '''
         Close connection to the server
         '''
+        self.connected = False
         self._socket.close()
         self._socket = None
 
     def connect_basic(self):
-        if self.host == None:
+        if self.host is None:
             self.connect_unix()
         else:
             self.connect_tcp()
@@ -201,11 +201,9 @@ def connect(self):
         :raise: `NetworkError`
         '''
         try:
-            self.authenticated = False
             self.connect_basic()
             self.handshake()
             self.load_schema()
-            self.authenticated = True
         except Exception as e:
             self.connected = False
             raise NetworkError(e)
@@ -295,13 +293,12 @@ def check():  # Check that connection is alive
                 retbytes = self._sys_recv(sock_fd, buf, 1, flag)
 
                 err = 0
-                if os.name!= 'nt':
+                if os.name != 'nt':
                     err = ctypes.get_errno()
                 else:
                     err = ctypes.get_last_error()
                     self._socket.setblocking(True)
 
-
                 WWSAEWOULDBLOCK = 10035
                 if (retbytes < 0) and (err == errno.EAGAIN or
                                        err == errno.EWOULDBLOCK or
@@ -368,38 +365,20 @@ def call(self, func_name, *args):
 
         :param func_name: stored Lua function name
         :type func_name: str
-        :param args: list of function arguments
-        :type args: list or tuple
+        :param args: function arguments
+        :type args: tuple
 
         :rtype: `Response` instance
         '''
 
+        assert isinstance(func_name, str)
+
         # This allows to use a tuple or list as an argument
         if len(args) == 1 and isinstance(args[0], (list, tuple)):
             args = args[0]
 
-        return self.call_ex(func_name, args, True)
-
-    def call_ex(self, func_name, args=[], reconnect=True):
-        '''
-        Execute CALL request. Call stored Lua function.
-
-        :param func_name: stored Lua function name
-        :type func_name: str
-        :param args: list of function arguments
-        :type args: list or tuple
-        :param reconnect: reconnect before call
-        :type reconnect: boolean
-
-        :rtype: `Response` instance
-        '''
-        assert isinstance(func_name, str)
-
         request = RequestCall(self, func_name, args, self.call_16)
-        if reconnect:
-            response = self._send_request(request)
-        else:
-            response = self._send_request_wo_reconnect(request)
+        response = self._send_request(request)
         return response
 
     def eval(self, expr, *args):
@@ -413,34 +392,14 @@ def eval(self, expr, *args):
 
         :rtype: `Response` instance
         '''
+        assert isinstance(expr, str)
 
         # This allows to use a tuple or list as an argument
         if len(args) == 1 and isinstance(args[0], (list, tuple)):
             args = args[0]
 
-        return self.eval_ex(expr, args, True)
-
-    def eval_ex(self, expr, args=[], reconnect=True):
-        '''
-        Execute EVAL request. Eval Lua expression.
-
-        :param expr: Lua expression
-        :type expr: str
-        :param args: list of function arguments
-        :type args: list or tuple
-        :param reconnect: reconnect before call
-        :type reconnect: boolean
-
-        :rtype: `Response` instance
-        '''
-        assert isinstance(expr, str)
-
         request = RequestEval(self, expr, args)
-        if reconnect:
-            response = self._send_request(request)
-        else:
-            response = self._send_request_wo_reconnect(request)
-        return response
+        return self._send_request(request)
 
     def replace(self, space_name, values):
         '''

tarantool/const.py

@@ -87,4 +87,4 @@
 # Default delay between attempts to reconnect (seconds)
 RECONNECT_DELAY = 0.1
 # Default cluster nodes list refresh interval (seconds)
-NODES_REFRESH_INTERVAL = 300
+CLUSTER_DISCOVERY_DELAY = 60

tarantool/error.py

@@ -151,6 +151,9 @@ class NetworkWarning(UserWarning):
     '''Warning related to network'''
     pass
 
+class ConfigurationWarning(UserWarning):
+    '''Warning in configuration validation'''
+    pass
 
 # always print this warnings
 warnings.filterwarnings("always", category=NetworkWarning)