From 469b41773a71f7fa037a12cabf2c186d746c21aa Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Tue, 7 Jan 2020 15:19:03 -0800
Subject: [PATCH] fix logging config which trough interfered with

---
 setup.py               | 2 +-
 warcprox/controller.py | 2 +-
 warcprox/dedup.py      | 2 +-
 warcprox/main.py       | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 3add2e8..9881520 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ except:
 
 setuptools.setup(
         name='warcprox',
-        version='2.4.23',
+        version='2.4.24',
         description='WARC writing MITM HTTP/S proxy',
         url='https://github.com/internetarchive/warcprox',
         author='Noah Levitt',
diff --git a/warcprox/controller.py b/warcprox/controller.py
index 84c3b93..8d670cb 100644
--- a/warcprox/controller.py
+++ b/warcprox/controller.py
@@ -111,7 +111,7 @@ class Factory:
             assert hasattr(plugin, 'notify') ^ hasattr(plugin, '_startup')
             return plugin
         except Exception as e:
-            logging.fatal('problem with plugin class %r: %s', qualname, e)
+            logging.fatal('problem with plugin class %r', qualname, exc_info=1)
             sys.exit(1)
 
     @staticmethod
diff --git a/warcprox/dedup.py b/warcprox/dedup.py
index 5613ec7..8227aa7 100644
--- a/warcprox/dedup.py
+++ b/warcprox/dedup.py
@@ -26,7 +26,6 @@ import os
 import json
 from hanzo import warctools
 import warcprox
-import trough.client
 import sqlite3
 import doublethink
 import datetime
@@ -507,6 +506,7 @@ class TroughDedupDb(DedupDb, DedupableMixin):
                       'values (%s, %s, %s, %s);')
 
     def __init__(self, options=warcprox.Options()):
+        import trough.client
         DedupableMixin.__init__(self, options)
         self.options = options
         self._trough_cli = trough.client.TroughClient(
diff --git a/warcprox/main.py b/warcprox/main.py
index d61e6b1..3afc1bb 100644
--- a/warcprox/main.py
+++ b/warcprox/main.py
@@ -302,6 +302,7 @@ def main(argv=None):
     else:
         loglevel = logging.INFO
 
+    logging.root.handlers = []
     logging.basicConfig(
             stream=sys.stdout, level=loglevel, format=(
                 '%(asctime)s %(process)d %(levelname)s %(threadName)s '