Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Abstracted out requests.post/get so we can use requests.Session() for… #114

Merged
merged 1 commit into from
May 20, 2016
Merged

Abstracted out requests.post/get so we can use requests.Session() for… #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions rollbar/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import requests
import six

from rollbar.lib import dict_merge, map, parse_qs, text, urljoin, iteritems
from rollbar.lib import dict_merge, map, parse_qs, text, transport, urljoin, iteritems

__version__ = '0.12.1'
log = logging.getLogger(__name__)
Expand Down Expand Up @@ -1140,11 +1140,11 @@ def _post_api(path, payload, access_token=None):
headers['X-Rollbar-Access-Token'] = access_token

url = urljoin(SETTINGS['endpoint'], path)
resp = requests.post(url,
data=payload,
headers=headers,
timeout=SETTINGS.get('timeout', DEFAULT_TIMEOUT),
verify=SETTINGS.get('verify_https', True))
resp = transport.post(url,
data=payload,
headers=headers,
timeout=SETTINGS.get('timeout', DEFAULT_TIMEOUT),
verify=SETTINGS.get('verify_https', True))

return _parse_response(path, SETTINGS['access_token'], payload, resp)

Expand All @@ -1153,7 +1153,7 @@ def _get_api(path, access_token=None, endpoint=None, **params):
access_token = access_token or SETTINGS['access_token']
url = urljoin(endpoint or SETTINGS['endpoint'], path)
params['access_token'] = access_token
resp = requests.get(url, params=params, verify=SETTINGS.get('verify_https', True))
resp = transport.get(url, params=params, verify=SETTINGS.get('verify_https', True))
return _parse_response(path, access_token, params, resp, endpoint=endpoint)


Expand Down
14 changes: 14 additions & 0 deletions rollbar/lib/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import requests

_session = requests.Session()


def post(*args, **kw):
return _session.post(*args, **kw)


def get(*args, **kw):
return _session.get(*args, **kw)


__all__ = ['post', 'get']
2 changes: 1 addition & 1 deletion rollbar/test/test_rollbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ def test_unicode_exc_info(self, send_payload):
payload = json.loads(send_payload.call_args[0][0])
self.assertEqual(payload['data']['body']['trace']['exception']['message'], message)

@mock.patch('requests.post', side_effect=lambda *args, **kw: MockResponse({'status': 'OK'}, 200))
@mock.patch('rollbar.lib.transport.post', side_effect=lambda *args, **kw: MockResponse({'status': 'OK'}, 200))
def test_serialize_and_send_payload(self, post=None):
invalid_b64 = b'CuX2JKuXuLVtJ6l1s7DeeQ=='
invalid = base64.b64decode(invalid_b64)
Expand Down