From a157229ca97aa2102300a3f032795376d784735f Mon Sep 17 00:00:00 2001
From: Jeremy Dunck <jdunck@votizen.com>
Date: Wed, 13 Jun 2012 13:50:28 -0700
Subject: [PATCH] Reformatting all internal logs to defer interpolation so
 rollup works. Originally motivated by 'bad message from ('75.101.56.188',
 38109): Message has expired' not rolling up.

---
 sentry/coreapi.py         | 4 ++--
 sentry/filters/helpers.py | 2 +-
 sentry/manager.py         | 4 ++--
 sentry/models.py          | 2 +-
 sentry/services/udp.py    | 2 +-
 sentry/utils/db.py        | 2 +-
 sentry/utils/safe.py      | 2 +-
 sentry/web/api.py         | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sentry/coreapi.py b/sentry/coreapi.py
index ce0052df72a1fd..4ec7ef810e9350 100644
--- a/sentry/coreapi.py
+++ b/sentry/coreapi.py
@@ -290,10 +290,10 @@ def validate_data(project, data, client=None):
             process_data_timestamp(data)
         except InvalidTimestamp:
             # Log the error, remove the timestamp, and continue
-            logger.error('Client %r passed an invalid value for timestamp %r' % (
+            logger.error('Client %r passed an invalid value for timestamp %r', 
                 client or '<unknown client>',
                 data['timestamp'],
-            ))
+            )
             del data['timestamp']
 
     if data.get('modules') and type(data['modules']) != dict:
diff --git a/sentry/filters/helpers.py b/sentry/filters/helpers.py
index 0c57d1f329df0d..212b0adf929df7 100644
--- a/sentry/filters/helpers.py
+++ b/sentry/filters/helpers.py
@@ -32,7 +32,7 @@ def get_filters(model=None, project=None):
                 cls = getattr(module, class_name)
             except Exception:
                 logger = logging.getLogger('sentry.errors.filters')
-                logger.exception('Unable to import %s' % (class_path,))
+                logger.exception('Unable to import %s', class_path)
                 continue
             FILTER_CACHE[class_path] = cls
         filter_list.append(FILTER_CACHE[class_path])
diff --git a/sentry/manager.py b/sentry/manager.py
index f487730a4f9460..58ce99befd81c9 100644
--- a/sentry/manager.py
+++ b/sentry/manager.py
@@ -455,9 +455,9 @@ def from_kwargs(self, project, **kwargs):
         except Exception, exc:
             # TODO: should we mail admins when there are failures?
             try:
-                logger.exception(u'Unable to process log entry: %s' % (exc,))
+                logger.exception(u'Unable to process log entry: %s', exc)
             except Exception, exc:
-                warnings.warn(u'Unable to process log entry: %s' % (exc,))
+                warnings.warn(u'Unable to process log entry: %s', exc)
 
             return
 
diff --git a/sentry/models.py b/sentry/models.py
index 272de9365a128c..82f2b35ed7a6e0 100644
--- a/sentry/models.py
+++ b/sentry/models.py
@@ -708,7 +708,7 @@ def register_indexes(**kwargs):
     logger = logging.getLogger('sentry.setup')
     for cls in (f for f in get_filters() if f.column.startswith('data__')):
         MessageIndex.objects.register_index(cls.column, index_to='group')
-        logger.debug('Registered index for for %r' % cls.column)
+        logger.debug('Registered index for for %r', cls.column)
 class_prepared.connect(register_indexes, sender=MessageIndex)
 
 
diff --git a/sentry/services/udp.py b/sentry/services/udp.py
index edb8fd11ed7341..5886c88ed2ddc7 100644
--- a/sentry/services/udp.py
+++ b/sentry/services/udp.py
@@ -56,7 +56,7 @@ def handle(self, data, address):
 
             return insert_data_to_database(data)
         except APIError, error:
-            logger.error('bad message from %s: %s' % (address, error.msg))
+            logger.error('bad message from %s: %s', address, error.msg)
             return error
 
     def run(self):
diff --git a/sentry/utils/db.py b/sentry/utils/db.py
index fc1679dbeff076..e3e6adff5b8462 100644
--- a/sentry/utils/db.py
+++ b/sentry/utils/db.py
@@ -63,7 +63,7 @@ def all(self):
                     results.append(cls)
             except Exception:
                 logger = logging.getLogger('sentry.errors')
-                logger.exception('Unable to import %s' % (cls_path,))
+                logger.exception('Unable to import %s', cls_path)
                 continue
         self.cache = results
 
diff --git a/sentry/utils/safe.py b/sentry/utils/safe.py
index 73250c87e10b29..7a02109e24b774 100644
--- a/sentry/utils/safe.py
+++ b/sentry/utils/safe.py
@@ -22,7 +22,7 @@ def safe_execute(func, *args, **kwargs):
         else:
             cls = func.__class__
         logger = logging.getLogger('sentry.plugins')
-        logger.error('Error processing %r on %%r: %%s' % func.__name__, cls.__name__, e, extra={
+        logger.error('Error processing %r on %%r: %%s', func.__name__, cls.__name__, e, extra={
             'func_module': cls.__module__,
             'func_args': args,
             'func_kwargs': kwargs,
diff --git a/sentry/web/api.py b/sentry/web/api.py
index 3b8162034543e8..181bf36fc8a1e5 100644
--- a/sentry/web/api.py
+++ b/sentry/web/api.py
@@ -172,12 +172,12 @@ def store(request, project=None):
 
             insert_data_to_database(data)
         except APIError, error:
-            logger.error('Client %r raised API error: %s' % (client, error), extra={
+            logger.error('Client %r raised API error: %s', client, error, extra={
                 'request': request,
             }, exc_info=True)
             response = HttpResponse(unicode(error.msg), status=error.http_status)
         else:
-            logger.info('New event from client %r (id=%%s)' % client, data['event_id'])
+            logger.info('New event from client %r (id=%%s)', client, data['event_id'])
 
     return response