Merge branch '0.1.6'

Author: shawnbutts

.bumpversion.cfg

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

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+0.1.6 (2016-05-20)
+---------------------
+
+* fix handling of http errors
+
 0.1.5 (2016-05-03)
 ---------------------
 

netuitive/__init__.py

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

netuitive/client.py

@@ -104,10 +104,11 @@ def post(self, element):
                 raise Exception(errmsg)
 
         except urllib2.HTTPError as e:
-            self.disabled = True
             logging.debug("Response code: %d", e.code)
 
             if e.code in self.kill_codes:
+                self.disabled = True
+
                 logging.exception('Posting has been disabled.'
                                   'See previous errors for details.')
             else:
@@ -146,10 +147,10 @@ def post_event(self, event):
             return(True)
 
         except urllib2.HTTPError as e:
-            self.disabled = True
             logging.debug("Response code: %d", e.code)
 
             if e.code in self.kill_codes:
+                self.disabled = True
                 logging.exception('Posting has been disabled.'
                                   'See previous errors for details.')
             else:

setup.py

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

tests/test_netuitive_client.py

@@ -251,6 +251,31 @@ def test_kill_switch_418(self, mock_logging, mock_post):
         self.assertEqual(mock_logging.exception.call_args_list[0][0][
                          0], 'Posting has been disabled.See previous errors for details.')
 
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_not_kill_switch_504(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=504)
+
+        a = netuitive.Client(api_key='apikey')
+        mock_post.side_effect = urllib2.HTTPError(a.url, 504, '', {}, None)
+
+        e = netuitive.Element()
+
+        e.add_sample(
+            'nonsparseDataStrategy', 1434110794, 1, 'COUNTER', host='hostname')
+
+        resp = a.post(e)
+        resp2 = a.post(e)
+
+        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')
+
     def tearDown(self):
         pass
 
@@ -359,6 +384,27 @@ def test_kill_switch_418(self, mock_logging, mock_post):
         self.assertEqual(mock_logging.exception.call_args_list[0][0][
                          0], 'Posting has been disabled.See previous errors for details.')
 
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_not_kill_switch_504(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=504)
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+        mock_post.side_effect = urllib2.HTTPError(a.url, 504, '', {}, None)
+
+        e = netuitive.Event(
+            'test', 'INFO', 'test event', 'big old test message', 'INFO')
+
+        resp = a.post_event(e)
+        resp2 = a.post_event(e)
+
+        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')
+
     def tearDown(self):
         pass