backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' into qa

Browse Source 
* master:
  fix idle rollover
  back to dev version number
  2.4b3 for pypi
  add idna as dep with acceptable to other deps
This commit is contained in:
Noah Levitt 2019-01-21 10:37:32 -08:00
commit fc1a3bc486
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup.py
View File

@ -2,7 +2,7 @@
''' '''
setup.py - setuptools installation configuration for warcprox setup.py - setuptools installation configuration for warcprox
Copyright (C) 2013-2018 Internet Archive Copyright (C) 2013-2019 Internet Archive
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -25,13 +25,14 @@ import setuptools
deps = [ deps = [
'certauth==1.1.6', 'certauth==1.1.6',
'warctools>=4.10.0', 'warctools>=4.10.0,<=4.10.0',
'urlcanon>=0.1.dev16', 'urlcanon>=0.1.dev16',
'doublethink>=0.2.0.dev87', 'doublethink>=0.2.0.dev87',
'urllib3>=1.23', 'urllib3>=1.23',
'requests>=2.0.1', 'requests>=2.0.1',
'PySocks>=1.6.8', 'PySocks>=1.6.8',
'cryptography>=2.3', 'cryptography>=2.3',
'idna>=2.5',
] ]
try: try:
import concurrent.futures import concurrent.futures
@ -40,7 +41,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.4b3.dev192', version='2.4b4.dev195',
description='WARC writing MITM HTTP/S proxy', description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox', url='https://github.com/internetarchive/warcprox',
author='Noah Levitt', author='Noah Levitt',
@ -66,6 +67,7 @@ setuptools.setup(
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Internet :: Proxy Servers', 'Topic :: Internet :: Proxy Servers',
'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',

1
warcprox/writerthread.py
View File

@ -57,6 +57,7 @@ class WarcWriterProcessor(warcprox.BaseStandardPostfetchProcessor):
self.writer_pool.close_for_prefix(prefix) self.writer_pool.close_for_prefix(prefix)
except queue.Empty: except queue.Empty:
break break
self.writer_pool.maybe_idle_rollover()
super()._get_process_put() super()._get_process_put()
def close_for_prefix(self, prefix=None): def close_for_prefix(self, prefix=None):