Merge cbc4490 into b549b14

ptero_common/logging_configuration.py

@@ -1,6 +1,7 @@
 from termcolor import colored
 import requests
 from requests.models import Request
+from requests.exceptions import ConnectionError
 import logging
 import os
 from pprint import pformat
@@ -82,6 +83,8 @@ def wrapper(*args, **kwargs):
 
         try:
             response = target(*args, **kwargs)
+        except ConnectionError:
+            raise
         except Exception as e:
             logger.exception(
                 "Unexpected exception while sending %s request\n"
@@ -91,7 +94,12 @@ def wrapper(*args, **kwargs):
                 kind.upper(), pformat(args), pformat(kwargs), str(e))
             raise
 
+        if 'timeout' in kwargs:
+            # timout is an argument to requests.get/post/ect but not
+            # Request.__init__
+            del kwargs['timeout']
         r = Request(kind.upper(), *args, **kwargs)
+
         logger.info("%s from %s  %s", response.status_code, kind.upper(), r.url)
         for name in ['params', 'headers', 'data']:
             logger.debug("    %s%s: %s", name[0].upper(), name[1:],