twilio · codejudas · Oct 20, 2017 · Aug 8, 2017 · Sep 18, 2017 · Oct 17, 2017
diff --git a/twilio/http/http_client.py b/twilio/http/http_client.py
@@ -1,18 +1,23 @@
-from requests import Request, Session
+from requests import Request, Session, hooks
 
 from twilio.http import HttpClient
 from twilio.http.response import Response
 from twilio.http.request import Request as TwilioRequest
+import logging
+from twilio.compat import urlencode
+
+_logger = logging.getLogger('twilio.http_client')
 
 
 class TwilioHttpClient(HttpClient):
     """
     General purpose HTTP Client for interacting with the Twilio API
     """
-    def __init__(self, pool_connections=True):
+    def __init__(self, pool_connections=True, request_hooks=None):
         self.session = Session() if pool_connections else None
         self.last_request = None
         self.last_response = None
+        self.request_hooks = request_hooks or hooks.default_hooks()
 
     def request(self, method, url, params=None, data=None, headers=None, auth=None, timeout=None,
                 allow_redirects=False):
@@ -33,11 +38,28 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
         :rtype: A :class:`Response <twilio.rest.http.response.Response>` object
         """
 
+        kwargs = {
+            'method': method.upper(),
+            'url': url,
+            'params': params,
+            'data': data,
+            'headers': headers,
+            'auth': auth,
+            'hooks': self.request_hooks
+        }
+
+        if params:
+            _logger.info('{method} Request: {url}?{query}'.format(query=urlencode(params), **kwargs))
+            _logger.info('PARAMS: {params}'.format(**kwargs))
+        else:
+            _logger.info('{method} Request: {url}'.format(**kwargs))
+        if data:
+            _logger.info('PAYLOAD: {data}'.format(**kwargs))
+
         self.last_response = None
         session = self.session or Session()
-        request = Request(method.upper(), url, params=params, data=data, headers=headers, auth=auth)
-        self.last_request = TwilioRequest(method.upper(), url, auth=auth, params=params, data=data,
-                                          headers=headers)
+        request = Request(**kwargs)
+        self.last_request = TwilioRequest(**kwargs)
 
         prepped_request = session.prepare_request(request)
         response = session.send(
@@ -46,6 +68,8 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
             timeout=timeout,
         )
 
+        _logger.info('{method} Response: {status} {text}'.format(method=method, status=response.status_code, text=response.text))
+
         self.last_response = Response(int(response.status_code), response.text)
 
         return self.last_response
diff --git a/twilio/http/request.py b/twilio/http/request.py
@@ -13,7 +13,8 @@ def __init__(self,
                  auth=ANY,
                  params=ANY,
                  data=ANY,
-                 headers=ANY):
+                 headers=ANY,
+                 **kwargs):
         self.method = method.upper()
         self.url = url
         self.auth = auth

diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -18,7 +18,7 @@ class Client(object):
     """ A client for accessing the Twilio API. """
 
     def __init__(self, username=None, password=None, account_sid=None, region=None,
-                 http_client=None, environment=None):
+                 http_client=None, environment=None, request_hooks=None):
         """
         Initializes the Twilio Client
 
@@ -48,7 +48,7 @@ def __init__(self, username=None, password=None, account_sid=None, region=None,
 
         self.auth = (self.username, self.password)
         """ :type : tuple(str, str) """
-        self.http_client = http_client or TwilioHttpClient()
+        self.http_client = http_client or TwilioHttpClient(request_hooks=request_hooks)
         """ :type : HttpClient """
 
         # Domains