Merge branch 'master' of github.com:sprockets/sprockets-postgres

This commit is contained in:
Gavin M. Roy 2020-08-11 19:31:56 -04:00
commit 507704a6e7
3 changed files with 5 additions and 2 deletions

View file

@ -1 +1 @@
1.3.2
1.3.3

View file

@ -713,7 +713,7 @@ class RequestHandlerMixin:
if hasattr(self, 'influxdb'): # sprockets-influxdb
self.influxdb.set_field(metric_name, duration)
elif hasattr(self, 'record_timing'): # sprockets.mixins.metrics
self.record_timing(metric_name, duration)
self.record_timing(duration, metric_name)
else:
LOGGER.debug('Postgres query %s duration: %s',
metric_name, duration)

View file

@ -405,6 +405,9 @@ class RequestHandlerMixinTestCase(TestCase):
self.assertEqual(response.code, 200)
self.assertEqual(json.loads(response.body)['value'], expectation)
self.app.record_timing.assert_called_once()
duration, metric_name = self.app.record_timing.call_args[0]
self.assertGreater(duration, 0.0)
self.assertEqual('', metric_name)
def test_postgres_multirow_get(self):
response = self.fetch('/multi-row')