Merge pull request #67 from Worvast/master

Fixed reconnection to socket in every send instruction of Sender

Author: Worvast

.pep8speaks.yml

@@ -0,0 +1,4 @@
+# File : .pep8speaks.yml
+
+scanner:
+    diff_only: True  # Errors caused by only the patch are shown

CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+## [3.0.3] - 2019-09-25
+#### Fixed
+ * Fixed reconnection to socket in every send instruction of Sender
+ * Code style changes
+ * Added pep8speaks file for Github
+
+
 ## [3.0.2] - 2019-07-01
 #### Fixed
  * API dates when int, verify if len its correct before add 3 zero

README.md

@@ -1,7 +1,7 @@
 
 [![master Build Status](https://travis-ci.com/DevoInc/python-sdk.svg?branch=master)](https://travis-ci.com/DevoInc/python-sdk) [![LICENSE](https://img.shields.io/dub/l/vibe-d.svg)](https://github.com/DevoInc/python-sdk/blob/master/LICENSE)
 
-[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-3.0.2-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-3.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
+[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-3.0.3-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-3.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
 
 
 # Devo Python SDK

devo/__version__.py

@@ -1,7 +1,7 @@
 __description__ = 'Devo Python Library.'
 __url__ = 'http://www.devo.com'
-__version__ = "3.0.2"
+__version__ = "3.0.3"
 __author__ = 'Devo'
 __author_email__ = 'support@devo.com'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2018 Devo'
+__copyright__ = 'Copyright 2019 Devo'

devo/api/client.py

@@ -237,9 +237,15 @@ def _is_correct_response(line):
         except ValueError:
             return False
 
-    def configurate(self, processor=None, response=None, stream=None,
-                    destination=None):
-
+    def configurate(self, processor=None, response=None,
+                    destination=None, stream=True):
+        """
+        Method for fill Configuration options more easy
+        :param processor: processor for response, default is None
+        :param response: format of response
+        :param destination: Destination options, see Doc for more info
+        :param stream: Stream queries or not
+        """
         self.config.set_processor(processor)
         if response:
             self.config.response = response

devo/sender/data.py

@@ -42,7 +42,6 @@ class SenderConfigSSL:
         Sender
 
     """
-
     def __init__(self, address=None, key=None, cert=None, chain=None):
         if not isinstance(address, tuple):
             raise DevoSenderException(
@@ -63,14 +62,12 @@ def __init__(self, address=None, key=None, cert=None, chain=None):
 class SenderConfigTCP:
     """
     Configuration TCP class.
+    :param address:(tuple) Server address and port
 
-    :param address:(str) Server address
-
-    >>>sender_config = SenderConfigTCP(address=SERVER, port=PORT)
+    >>>sender_config = SenderConfigTCP(address=(ADDRESS, PORT))
 
     See Also:
         Sender
-
     """
 
     def __init__(self, address=None):
@@ -107,8 +104,7 @@ class Sender(logging.Handler):
     :param logger: logger. Default sys.console
     """
     def __init__(self, config=None, con_type=None,
-                 timeout=10, debug=False, logger=None):
-
+                 timeout=30, debug=False, logger=None):
         if config is None:
             raise DevoSenderException("Problems with args passed to Sender")
 
@@ -127,7 +123,8 @@ def __init__(self, config=None, con_type=None,
         self._sender_config = config
         self.reconnection = 0
         self.debug = debug
-        self.timeout = timeout
+        self.socket_timeout = timeout
+        self.socket_max_connection = 3600 * 1000
         self.buffer = SenderBuffer()
         self.logging = {}
 
@@ -149,7 +146,7 @@ def __connect_tcp_socket(self):
         :return:
         """
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.socket.settimeout(self.timeout)
+        self.socket.settimeout(self.socket_timeout)
         try:
             self.socket.connect(self._sender_config.address)
         except socket.error as error:
@@ -165,7 +162,7 @@ def __connect_ssl(self):
 
         """
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.socket.settimeout(self.timeout)
+        self.socket.settimeout(self.socket_timeout)
 
         try:
             try:
@@ -214,10 +211,8 @@ def __status(self):
         timeit = int(round(time.time() * 1000)) - self.timestart
         if self.socket is None:
             return False
-        if not self.timeout:
-            self.timeout = 10
 
-        if self.timeout < timeit:
+        if self.socket_max_connection < timeit:
             self.close()
             return False
         return True