Merge branch 'develop'

Author: TheConnMan

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.3
+current_version = 0.3.4
 commit = False
 tag = False
 files = setup.py netuitive/__init__.py

.python-version

@@ -1,6 +1,5 @@
-2.6.9
-2.7.11
-3.2.6
-3.3.6
-3.4.3
-3.5.1
+2.7.15
+3.4.9
+3.5.6
+3.6.7
+3.7.1

.travis.yml

@@ -3,12 +3,15 @@ sudo: false
 
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
-
+  - "3.6"
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 
 cache:
   directories:

netuitive/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __author__ = 'Netuitive, Inc'
-__version__ = '0.3.3'
+__version__ = '0.3.4'
 
 from .client import Client  # nopep8 # flake8: noqa
 from .element import Element  # nopep8 # flake8: noqa

netuitive/client.py

@@ -51,6 +51,7 @@ def __init__(self, url='https://api.app.netuitive.com/ingest',
         self.post_error_count = 0
         self.max_post_errors = 10
         self.connection_timeout = connection_timeout
+        self.max_check_retry_count = 3
 
     def post(self, element):
         """
@@ -170,11 +171,11 @@ def post_check(self, check):
             + check.name + '/' \
             + check.elementId + '/' \
             + str(check.ttl)
+        headers = {'User-Agent': self.agent}
         try:
-            headers = {'User-Agent': self.agent}
             request = urllib2.Request(
                 url, data='', headers=headers)
-            resp = urllib2.urlopen(request, timeout=self.connection_timeout)
+            resp = self._repeat_request(request, self.connection_timeout)
             logging.debug("Response code: %d", resp.getcode())
             resp.close()
 
@@ -219,3 +220,15 @@ def time_insync(self):
 
         else:
             return(False)
+
+    def _repeat_request(self, request, timeout):
+        for i in range(self.max_check_retry_count + 1):
+            try:
+                return urllib2.urlopen(request, timeout=timeout)
+            except urllib2.HTTPError as e:
+                if 500 <= e.code < 600 and i < self.max_check_retry_count:
+                    logging.debug("Response code: %d, retry count: %d from %d",
+                                  e.code, i + 1, self.max_check_retry_count)
+                    time.sleep(0.25 * (i + 1))
+                else:
+                    raise

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='netuitive',
-    version='0.3.3',
+    version='0.3.4',
     description="Python Client for Netuitive Cloud",
     long_description=readme + '\n\n' + history,
     author="Netuitive",

tests/test_netuitive_client.py

@@ -441,7 +441,7 @@ def test_failure_general_http(self, mock_logging, mock_post):
         resp = a.post_check(e)
 
         self.assertNotEqual(resp, True)
-
+        self.assertEquals(mock_post.call_count, a.max_check_retry_count + 1)
         self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'HTTPError posting payload to api ingest endpoint (%s): %s')
 
     @mock.patch('netuitive.client.urllib2.urlopen')

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35
+envlist = py27, py34, py35, py36, py37
 tox_pyenv_fallback = False
 
 [testenv]