Merge pull request #10 from TJM/issue-8

Issue #8 - Continue on HTTPException (httplib.BadStatusLine)
LarkIT · Nov 4, 2014 · b11c9b2 · b11c9b2
2 parents d695443 + bd460cb
commit b11c9b2
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/plugin.py b/src/plugin.py
@@ -25,6 +25,7 @@
 import json
 import psutil
 import urllib2
+import httplib
 import ConfigParser
 import os
 import sys
@@ -309,18 +310,24 @@ def add_to_newrelic(self):
                 self.logger.debug('Response: %s' % response.read())
 
             if response.code == 200:
+                # Only reset on success (allows the exceptions below to continue)
                 self._successful_run_reset()
 
             response.close()
 
+        except httplib.HTTPException, err:
+            self.logger.error(err)
+            self.logger.debug("HTTP Exception: %s" % err.read())
+            pass    # continue on this error
+
         except urllib2.HTTPError, err:
             self.logger.error(err)
-            self.logger.debug("ErrorPage: %s" % err.read())
-            pass    #i know, i don't like it either, but we don't want a single failed connection to break the loop.
+            self.logger.debug("HTTP Error: %s" % err.read())
+            pass    # continue
 
         except urllib2.URLError, err:
             # URLError (DNS Error?)
             self.logger.error(err)
-            self.logger.debug('Reason: %s' % err.reason)
-            pass
+            self.logger.debug('URL Error: %s' % err.reason)
+            pass    # continue
         self._reset_json_data()