Merge branch 'develop'

* develop:
  bump version to 0.3.3
  break long lines into multiple lines to make lint pass
  add connection timout to client and remove generic exception catching to allow it to propagate, e.g. SIGALRMException

Author: Yahong Gu

.bumpversion.cfg

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

netuitive/__init__.py

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

netuitive/client.py

@@ -30,7 +30,9 @@ class Client(object):
     """
 
     def __init__(self, url='https://api.app.netuitive.com/ingest',
-                 api_key='apikey', agent='Netuitive-Python/' + __version__):
+                 api_key='apikey',
+                 agent='Netuitive-Python/' + __version__,
+                 connection_timeout=5):
 
         if url.endswith('/'):
             url = url[:-1]
@@ -48,6 +50,7 @@ def __init__(self, url='https://api.app.netuitive.com/ingest',
         self.kill_codes = [410, 418]
         self.post_error_count = 0
         self.max_post_errors = 10
+        self.connection_timeout = connection_timeout
 
     def post(self, element):
         """
@@ -171,7 +174,7 @@ def post_check(self, check):
             headers = {'User-Agent': self.agent}
             request = urllib2.Request(
                 url, data='', headers=headers)
-            resp = urllib2.urlopen(request)
+            resp = urllib2.urlopen(request, timeout=self.connection_timeout)
             logging.debug("Response code: %d", resp.getcode())
             resp.close()
 
@@ -186,14 +189,10 @@ def post_check(self, check):
                                   'See previous errors for details.')
             else:
                 logging.exception(
-                    'error posting payload to api ingest endpoint (%s): %s',
+                    'HTTPError posting payload to api ingest endpoint'
+                    + ' (%s): %s',
                     url, e)
 
-        except Exception as e:
-            logging.exception(
-                'error posting payload to api ingest endpoint (%s): %s',
-                url, e)
-
     def check_time_offset(self, epoch=None):
         req = urllib2.Request(self.timeurl,
                               headers={'User-Agent': self.agent})

setup.py

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

tests/test_netuitive_client.py

@@ -402,6 +402,10 @@ class TestClientCheckPost(unittest.TestCase):
     def setUp(self):
         pass
 
+    def test_client_connection_timeout(self):
+        a = netuitive.Client(connection_timeout=30)
+        self.assertEqual(a.connection_timeout, 30)
+
     @mock.patch('netuitive.client.urllib2.urlopen')
     @mock.patch('netuitive.client.logging')
     def test_success(self, mock_logging, mock_post):
@@ -417,6 +421,9 @@ def test_success(self, mock_logging, mock_post):
 
         self.assertTrue(resp)
 
+        args, kwargs = mock_post.call_args
+        self.assertEqual(kwargs['timeout'], 5)
+
         self.assertEqual(mock_logging.exception.call_args_list, [])
 
     @mock.patch('netuitive.client.urllib2.urlopen')
@@ -431,27 +438,11 @@ def test_failure_general_http(self, mock_logging, mock_post):
 
         e = netuitive.Check('check', 'test', 60)
 
-        resp = a.post_event(e)
-
-        self.assertNotEqual(resp, True)
-
-        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'error posting payload to api ingest endpoint (%s): %s')
-
-    @mock.patch('netuitive.client.urllib2.urlopen')
-    @mock.patch('netuitive.client.logging')
-    def test_failure_general(self, mock_logging, mock_post):
-        mock_post.side_effect = urllib2.URLError('something')
-
-        # test infrastructure endpoint url creation
-        a = netuitive.Client(api_key='apikey')
-
-        c = netuitive.Check('check', 'test', 60)
-
-        resp = a.post_check(c)
+        resp = a.post_check(e)
 
         self.assertNotEqual(resp, True)
 
-        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'error posting payload to api ingest endpoint (%s): %s')
+        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')
     @mock.patch('netuitive.client.logging')
@@ -509,7 +500,7 @@ def test_not_kill_switch_504(self, mock_logging, mock_post):
         self.assertNotEqual(resp, True)
         self.assertFalse(resp2)
         self.assertFalse(a.disabled)
-        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'error posting payload to api ingest endpoint (%s): %s')
+        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'HTTPError posting payload to api ingest endpoint (%s): %s')
 
     def tearDown(self):
         pass