From 62b385367a14a49181bc7649b46c6606f783f085 Mon Sep 17 00:00:00 2001 From: Joe Kemp Date: Tue, 28 Aug 2018 13:46:16 -0400 Subject: [PATCH 1/3] Handle frame data serialization errors --- rollbar/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rollbar/__init__.py b/rollbar/__init__.py index 3767c62f..42cfce30 100644 --- a/rollbar/__init__.py +++ b/rollbar/__init__.py @@ -837,7 +837,10 @@ def _add_locals_data(data, exc_info): if keywordspec: cur_frame['keywordspec'] = keywordspec if _locals: - cur_frame['locals'] = dict((k, _serialize_frame_data(v)) for k, v in iteritems(_locals)) + try: + cur_frame['locals'] = dict((k, _serialize_frame_data(v)) for k, v in iteritems(_locals)) + except Exception: + log.exception('Error while serializing frame data.') frame_num += 1 From ddd94b64b7ec83688ad1540774c3fee3d9927eee Mon Sep 17 00:00:00 2001 From: Joe Kemp Date: Thu, 30 Aug 2018 08:37:08 -0400 Subject: [PATCH 2/3] Add test for serialization failures --- rollbar/test/test_rollbar.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/rollbar/test/test_rollbar.py b/rollbar/test/test_rollbar.py index 2b49d82e..15d2018b 100644 --- a/rollbar/test/test_rollbar.py +++ b/rollbar/test/test_rollbar.py @@ -301,6 +301,22 @@ def __init__(self, arg1): self.assertEqual('arg1', payload['data']['body']['trace']['frames'][-1]['argspec'][1]) self.assertEqual(33, payload['data']['body']['trace']['frames'][-1]['locals']['arg1']) + @mock.patch('rollbar.send_payload') + def test_failed_locals_serialization(self, send_payload): + + class tmp(object): + @property + def __class__(self): + foo() + + try: + t = tmp() + raise Exception('trigger_serialize') + except: + rollbar.report_exc_info() + + self.assertEqual(send_payload.called, True) + @mock.patch('rollbar.send_payload') def test_args_lambda_no_args(self, send_payload): From da9fdc5cbe22f1b3709a99e96fdfae97b4cee399 Mon Sep 17 00:00:00 2001 From: Joe Kemp Date: Tue, 4 Sep 2018 11:57:28 -0400 Subject: [PATCH 3/3] Bump build