From 7fef2336e659defdd6ca25685814b4b1d6d09800 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Fri, 29 Dec 2017 16:28:48 -0800
Subject: [PATCH] fix logging.notice/trace methods which were masking
 file/line/function of log message

---
 setup.py             | 2 +-
 warcprox/__init__.py | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 2852885..2467579 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ except:
 
 setuptools.setup(
         name='warcprox',
-        version='2.3.1b4.dev135',
+        version='2.3.1b4.dev136',
         description='WARC writing MITM HTTP/S proxy',
         url='https://github.com/internetarchive/warcprox',
         author='Noah Levitt',
diff --git a/warcprox/__init__.py b/warcprox/__init__.py
index 6ac4fff..256ede9 100644
--- a/warcprox/__init__.py
+++ b/warcprox/__init__.py
@@ -95,24 +95,20 @@ class RequestBlockedByRule(Exception):
 # monkey-patch log levels TRACE and NOTICE
 TRACE = 5
 import logging
-def _logging_trace(msg, *args, **kwargs):
-    logging.root.trace(msg, *args, **kwargs)
 def _logger_trace(self, msg, *args, **kwargs):
     if self.isEnabledFor(TRACE):
         self._log(TRACE, msg, args, **kwargs)
-logging.trace = _logging_trace
 logging.Logger.trace = _logger_trace
+logging.trace = logging.root.trace
 logging.addLevelName(TRACE, 'TRACE')
 
 NOTICE = (logging.INFO + logging.WARN) // 2
 import logging
-def _logging_notice(msg, *args, **kwargs):
-    logging.root.notice(msg, *args, **kwargs)
 def _logger_notice(self, msg, *args, **kwargs):
     if self.isEnabledFor(NOTICE):
         self._log(NOTICE, msg, args, **kwargs)
-logging.notice = _logging_notice
 logging.Logger.notice = _logger_notice
+logging.notice = logging.root.notice
 logging.addLevelName(NOTICE, 'NOTICE')
 
 import warcprox.controller as controller