Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Fix handling of redirects. Previously, if a url caused a redirect, the r... #260

Open
jgsbennett wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix handling of redirects. Previously, if a url caused a redirect, the r... #260

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d232e2
Fix handling of redirects. Previously, if a url caused a redirect, th…
jgsbennett Apr 29, 2014
e245fbf
Minor changes based on feedback. Fixed bug introduced by last commit …
jgsbennett Apr 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions loads/measure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime
import urlparse

from requests.sessions import Session as _Session
from requests.sessions import Session as _Session, REDIRECT_STATI
from webtest.app import TestApp as _TestApp
from wsgiproxy.proxies import HostProxy as _HostProxy
from wsgiproxy.requests_client import HttpClient
Expand Down Expand Up @@ -78,16 +78,36 @@ def request(self, method, url, headers=None, **kwargs):
return super(Session, self).request(
method, url, headers=headers, **kwargs)

def resolve_redirects(self, resp, req, stream=False, timeout=None,
verify=True, cert=None, proxies=None):
"""If there is a redirect, need to record information about the hit before
it is obliterated by the next request."""
# Future version of requests (some time > 2.2.1) has Response.is_redirect
if 'location' in resp.headers and resp.status_code in REDIRECT_STATI:
resp.started = self._started
resp.method = req.method
self._analyse_request(resp)
req._needs_analysis = False
return _Session.resolve_redirects(self, resp, req, stream=stream, timeout=timeout,
verify=verify,cert=cert,proxies=proxies)

def send(self, request, **kwargs):
Copy link
Copy Markdown

@Dith3r Dith3r Jun 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To simplify this code (resolve_redirects is actually calling send method) i would propose change this method shown below without changing/adding resolve_redirects. Additional this will record any redirect hit.

allow_redirects = kwargs['allow_redirects']
kwargs['allow_redirects'] = False
start = datetime.datetime.utcnow()
res = _Session.send(self, request, **kwargs)
res.started = start
res.method = request.method
self._analyse_request(res)

if allow_redirects and res.is_redirect:
        for res in self.resolve_redirects(res, request):
            # resolve redirects returns generator which is calling send method 
            pass

return res

Copy link
Copy Markdown
Contributor

@tarekziade tarekziade Aug 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good

"""Do the actual request from within the session, doing some
measures at the same time about the request (duration, status, etc).
"""
# If the request receives a redirect response code, collecting the
# result will be handled by resolve_redirects() before the result
# object is thrown away to perform the redirect. In that case, this
# flag will be set to false, indicating that nothing needs to be
# (or should be) recorded at the end of this method.
request._needs_analysis = True
# attach some information to the request object for later use.
start = datetime.datetime.utcnow()
self._started = datetime.datetime.utcnow()
res = _Session.send(self, request, **kwargs)
res.started = start
res.method = request.method
self._analyse_request(res)
if request._needs_analysis == True:
res.started = self._started
res.method = request.method
self._analyse_request(res)
return res

def _analyse_request(self, req):
Expand Down