Merge branch '0.1.4'

Author: shawnbutts

HISTORY.rst

@@ -3,11 +3,17 @@
 History
 -------
 
+0.1.4 (2016-04-07)
+---------------------
+
+* improve HTTP response error handling
+* Update Development Status to 4 - Beta
+
 0.1.3 (2016-03-21)
 ---------------------
 
 * Add user agent to time offset check
-* better handling of null element ids
+* Better handling of null element ids
 
 0.1.2 (2016-03-09)
 ---------------------

netuitive/client.py

@@ -44,6 +44,8 @@ def __init__(self, url='https://api.app.netuitive.com/ingest',
         self.agent = agent
         self.max_metrics = 10000
         self.element_dict = {}
+        self.disabled = False
+        self.kill_codes = [410, 418]
 
     def post(self, element):
         """
@@ -53,6 +55,11 @@ def post(self, element):
 
         try:
 
+            if self.disabled is True:
+                element.clear_samples()
+                raise Exception('Posting has been disabled. \
+                    See previous errors for details.')
+
             if element.id is None:
                 raise Exception('element id is not set')
 
@@ -80,6 +87,11 @@ def post(self, element):
 
                 resp.close()
 
+                if resp.getcode() in self.kill_codes:
+                    self.disabled = True
+                    raise Exception('Posting has been disabled. \
+                    See previous errors for details.')
+
                 return(True)
 
             else:
@@ -118,6 +130,11 @@ def post_event(self, event):
             logging.debug("Response code: %d", resp.getcode())
             resp.close()
 
+            if resp.getcode() in self.kill_codes:
+                self.disabled = True
+                raise Exception('Posting has been disabled. '
+                                'See previous errors for details.')
+
             return(True)
 
         except Exception as e:

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='netuitive',
-    version='0.1.3',
+    version='0.1.4',
     description="Python Client for Netuitive Cloud",
     long_description=readme + '\n\n' + history,
     author="Netuitive",
@@ -41,7 +41,7 @@
     zip_safe=False,
     keywords='netuitive',
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Topic :: Software Development :: Libraries :: Python Modules',

tests/test_netuitive_client.py

@@ -185,6 +185,51 @@ def test_null_element_id(self, mock_logging, mock_post):
         self.assertEqual(str(mock_logging.exception.call_args_list[0][0][2]),
                          'element id is not set')
 
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_kill_switch_410(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=410)
+
+        a = netuitive.Client(api_key='apikey')
+        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.assertNotEqual(resp2, True)
+
+        self.assertTrue(a.disabled)
+
+        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_kill_switch_418(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=418)
+
+        a = netuitive.Client(api_key='apikey')
+        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.assertNotEqual(resp2, True)
+        self.assertTrue(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
 
@@ -232,6 +277,46 @@ def test_failure_general(self, mock_logging, mock_post):
         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_kill_switch_410(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=410)
+
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+
+        e = netuitive.Event(
+            'test', 'INFO', 'test event', 'big old test message', 'INFO')
+
+        resp = a.post_event(e)
+
+        self.assertNotEqual(resp, True)
+        self.assertTrue(a.disabled)
+
+        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_kill_switch_418(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=418)
+
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+
+        e = netuitive.Event(
+            'test', 'INFO', 'test event', 'big old test message', 'INFO')
+
+        resp = a.post_event(e)
+
+        self.assertNotEqual(resp, True)
+        self.assertTrue(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