summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2016-04-27 16:02:13 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2016-04-27 16:02:13 +0200
commit6073a9c3249e26402e8d7901a45594ba95248355 (patch)
treef2f3710395c1ade420fc86a7bc5b2a63eb04125f
parent4baedc02013c9bbe2d4f8cdd1418903f74214130 (diff)
downloadraven-6073a9c3249e26402e8d7901a45594ba95248355.tar.gz
Record db alias
-rw-r--r--raven/contrib/django/client.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/raven/contrib/django/client.py b/raven/contrib/django/client.py
index 6da179d..d10b6e7 100644
--- a/raven/contrib/django/client.py
+++ b/raven/contrib/django/client.py
@@ -85,36 +85,37 @@ def install_sql_hook():
# trickery would have to look different but I can't be bothered.
return
- def record_sql(vendor, start, duration, sql, params):
+ def record_sql(vendor, alias, start, duration, sql, params):
def _make_data():
real_sql, real_params = format_sql(sql, params)
return {
'query': real_sql,
'params': real_params,
'duration': duration,
- 'classifier': 'django.db.%s' % vendor
+ 'classifier': 'django.%s.%s' % (vendor, alias or 'default')
}
breadcrumbs.record_breadcrumb('query', _make_data)
- def record_many_sql(vendor, start, sql, param_list):
+ def record_many_sql(vendor, alias, start, sql, param_list):
duration = time.time() - start
for params in param_list:
- record_sql(vendor, start, duration, sql, params)
+ record_sql(vendor, alias, start, duration, sql, params)
def execute(self, sql, params=None):
start = time.time()
try:
return real_execute(self, sql, params)
finally:
- record_sql(self.db.vendor, start, time.time() - start,
- sql, params)
+ record_sql(self.db.vendor, getattr(self.db, 'alias', None),
+ start, time.time() - start, sql, params)
def executemany(self, sql, param_list):
start = time.time()
try:
return real_executemany(self, sql, param_list)
finally:
- record_many_sql(self.db.vendor, start, sql, param_list)
+ record_many_sql(self.db.vendor, getattr(self.db, 'alias', None),
+ start, sql, param_list)
CursorWrapper.execute = execute
CursorWrapper.executemany = executemany