fix logging config which trough interfered with

This commit is contained in:
Noah Levitt 2020-01-07 15:19:03 -08:00
parent 91fcc054c4
commit 469b41773a
4 changed files with 4 additions and 3 deletions

View File

@ -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',

View File

@ -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

View File

@ -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(

View File

@ -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 '