Merge pull request #8 from Netuitive/fix/issue-7

Handle 403 and other HTTP errors better

Author: TheConnMan

netuitive/client.py

@@ -46,6 +46,8 @@ def __init__(self, url='https://api.app.netuitive.com/ingest',
         self.element_dict = {}
         self.disabled = False
         self.kill_codes = [410, 418]
+        self.post_error_count = 0
+        self.max_post_errors = 10
 
     def post(self, element):
         """
@@ -88,6 +90,8 @@ def post(self, element):
 
                 resp.close()
 
+                self.post_error_count = 0
+
                 return(True)
 
             else:
@@ -112,11 +116,19 @@ def post(self, element):
                 logging.exception('Posting has been disabled.'
                                   'See previous errors for details.')
             else:
+                self.post_error_count += 1
+                if self.post_error_count > self.max_post_errors:
+                    element.clear_samples()
+
                 logging.exception(
                     'error posting payload to api ingest endpoint (%s): %s',
                     self.dataurl, e)
 
         except Exception as e:
+            self.post_error_count += 1
+            if self.post_error_count > self.max_post_errors:
+                element.clear_samples()  # pragma: no cover
+
             logging.exception(
                 'error posting payload to api ingest endpoint (%s): %s',
                 self.dataurl, e)

tests/test_netuitive_client.py

@@ -126,6 +126,37 @@ def test_failure_general_http(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_repeat_failure_general_http(self, mock_logging, mock_post):
+
+        a = netuitive.Client(api_key='apikey')
+
+        e = netuitive.Element()
+
+        e.add_sample(
+            'nonsparseDataStrategy', 1434110794, 1, 'COUNTER', host='hostname')
+
+        errs = [403, 429, 503, 404, 503, 204, 307, 302, 405, 413]
+
+        for i in range(a.max_post_errors):
+            mock_post.return_value = MockResponse(code=errs[i])
+            mock_post.side_effect = urllib2.HTTPError(
+                a.url, errs[i], '', {}, None)
+
+            resp = a.post(e)
+
+        resp = a.post(e)
+        self.assertNotEqual(resp, True)
+        self.assertFalse(resp)
+
+        self.assertFalse(a.disabled)
+
+        self.assertEqual(len(e.samples), 0)
+
+        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):