mirror of
https://github.com/internetarchive/warcprox.git
synced 2025-01-18 13:22:09 +01:00
Merge branch 'master' into qa
* master: fix logging config which trough interfered with bump version after merge bump version after merge change trough dedup `date` type to varchar
This commit is contained in:
commit
968ea7c273
4
setup.py
4
setup.py
@ -2,7 +2,7 @@
|
||||
'''
|
||||
setup.py - setuptools installation configuration for warcprox
|
||||
|
||||
Copyright (C) 2013-2019 Internet Archive
|
||||
Copyright (C) 2013-2020 Internet Archive
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
@ -44,7 +44,7 @@ except:
|
||||
|
||||
setuptools.setup(
|
||||
name='warcprox',
|
||||
version='2.4.21',
|
||||
version='2.4.24',
|
||||
description='WARC writing MITM HTTP/S proxy',
|
||||
url='https://github.com/internetarchive/warcprox',
|
||||
author='Noah Levitt',
|
||||
|
@ -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
|
||||
|
@ -26,7 +26,6 @@ import os
|
||||
import json
|
||||
from hanzo import warctools
|
||||
import warcprox
|
||||
import trough.client
|
||||
import sqlite3
|
||||
import doublethink
|
||||
import datetime
|
||||
@ -500,13 +499,14 @@ class TroughDedupDb(DedupDb, DedupableMixin):
|
||||
SCHEMA_SQL = ('create table dedup (\n'
|
||||
' digest_key varchar(100) primary key,\n'
|
||||
' url varchar(2100) not null,\n'
|
||||
' date datetime not null,\n'
|
||||
' date varchar(100) not null,\n'
|
||||
' id varchar(100));\n') # warc record id
|
||||
WRITE_SQL_TMPL = ('insert or ignore into dedup\n'
|
||||
'(digest_key, url, date, id)\n'
|
||||
'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(
|
||||
|
@ -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 '
|
||||
|
Loading…
x
Reference in New Issue
Block a user