From b948eef4678a5d051e9bc2fa070016747b518716 Mon Sep 17 00:00:00 2001
From: "Gavin M. Roy" <gavinr@aweber.com>
Date: Tue, 23 Jun 2015 17:48:34 -0400
Subject: [PATCH] Improved logging functionality

- Monkeypatch the logging.currentframe to make it smarter, better
- Don't sort the JSON
- Add logging messages and if they're set, then don't include the request attribute in the JSON log data
---
 docs/history.rst     |  5 +++++
 sprockets/logging.py | 49 +++++++++++++++++++++++++++++++++++---------
 tests.py             | 21 ++++++-------------
 3 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/docs/history.rst b/docs/history.rst
index bec3adf..5680a19 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -1,5 +1,10 @@
 Version History
 ===============
+`1.2.0`_ Jun 23, 2015
+---------------------
+ - Monkeypatch logging.currentframe
+ - Include a logging message if it's there
+
 `1.1.0`_ Jun 18, 2015
 ---------------------
  - Added :class:`sprockets.logging.JSONRequestFormatter`
diff --git a/sprockets/logging.py b/sprockets/logging.py
index 1ef3d3f..e6fb5b6 100644
--- a/sprockets/logging.py
+++ b/sprockets/logging.py
@@ -13,13 +13,14 @@ from __future__ import absolute_import
 from logging import config
 import json
 import logging
+import sys
 
 try:
     from tornado import log
 except ImportError:
     log = None
 
-version_info = (1, 1, 0)
+version_info = (1, 2, 0)
 __version__ = '.'.join(str(v) for v in version_info)
 
 # Shortcut methods and constants to avoid needing to import logging directly
@@ -71,15 +72,22 @@ class JSONRequestFormatter(logging.Formatter):
         :rtype: str
 
         """
-        return json.dumps({'name': record.name,
-                           'module': record.module,
-                           'level': logging.getLevelName(record.levelno),
-                           'line_number': record.lineno,
-                           'process': record.processName,
-                           'timestamp': self.formatTime(record),
-                           'thread': record.threadName,
-                           'file': record.filename,
-                           'request': record.args}, sort_keys=True)
+        output = {'name': record.name,
+                  'module': record.module,
+                  'message': record.msg % record.args,
+                  'level': logging.getLevelName(record.levelno),
+                  'line_number': record.lineno,
+                  'process': record.processName,
+                  'timestamp': self.formatTime(record),
+                  'thread': record.threadName,
+                  'file': record.filename,
+                  'request': record.args}
+        for key, value in list(output.items()):
+            if not value:
+                del output[key]
+        if 'message' in output:
+            del output['request']
+        return json.dumps(output)
 
 
 def tornado_log_function(handler):
@@ -112,3 +120,24 @@ def tornado_log_function(handler):
                     'query_args': handler.request.query_arguments,
                     'remote_ip': handler.request.remote_ip,
                     'status_code': status_code})
+
+
+def currentframe():
+    """Return the frame object for the caller's stack frame."""
+    try:
+        raise Exception
+    except:
+        traceback = sys.exc_info()[2]
+        frame = traceback.tb_frame
+        while True:
+            if hasattr(frame, 'f_code'):
+                filename = frame.f_code.co_filename
+                if filename.endswith('logging.py') or \
+                        filename.endswith('logging/__init__.py'):
+                    frame = frame.f_back
+                    continue
+                return frame
+        return traceback.tb_frame.f_back
+
+# Monkey-patch currentframe
+logging.currentframe = currentframe
diff --git a/tests.py b/tests.py
index c0d57f3..4e2bf9e 100644
--- a/tests.py
+++ b/tests.py
@@ -1,12 +1,11 @@
 import json
 import logging
-from os import path
 import random
-import threading
 import unittest
 import uuid
 
 import mock
+
 import sprockets.logging
 
 LOGGER = logging.getLogger(__name__)
@@ -130,17 +129,9 @@ class JSONRequestHandlerTestCase(unittest.TestCase):
                 'status_code': handler.status_code}
 
         LOGGER.info('', args)
-        record = logging_handler.records.pop(0)
         result = logging_handler.results.pop(0)
-        expectation = \
-            {'line_number': 132,
-             'file': path.basename(globals()['__file__']),
-             'level': 'INFO',
-             'module': globals()['__name__'],
-             'name': globals()['__name__'],
-             'process': 'MainProcess',
-             'thread': threading.current_thread().name,
-             'timestamp':
-                 logging_handler.formatter.formatTime(record),
-             'request': args}
-        self.assertEqual(result, json.dumps(expectation, sort_keys=True))
+        keys = ['line_number', 'file', 'level', 'module', 'name',
+                'process', 'thread', 'timestamp', 'request']
+        value = json.loads(result)
+        for key in keys:
+            self.assertIn(key, value)