From 7e555688515a3d9f2fa5b89e23f78c24f825fef8 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Tue, 5 Sep 2017 12:20:22 -0700 Subject: [PATCH] fix --playback-port option (https://github.com/internetarchive/warcprox/issues/29) --- setup.py | 2 +- warcprox/main.py | 7 +++---- warcprox/playback.py | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index e1b5bd8..ca512db 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ except: setuptools.setup( name='warcprox', - version='2.1b1.dev94', + version='2.1b1.dev95', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/main.py b/warcprox/main.py index 25fb3dc..351967a 100644 --- a/warcprox/main.py +++ b/warcprox/main.py @@ -212,11 +212,10 @@ def init_controller(args): stats_db=stats_db, options=options) if args.playback_port is not None: - playback_index_db = warcprox.playback.PlaybackIndexDb(args.playback_index_db_file, options=options) + playback_index_db = warcprox.playback.PlaybackIndexDb( + args.playback_index_db_file, options=options) playback_proxy = warcprox.playback.PlaybackProxy( - server_address=(args.address, args.playback_port), ca=ca, - playback_index_db=playback_index_db, warcs_dir=args.directory, - options=options) + ca=ca, playback_index_db=playback_index_db, options=options) listeners.append(playback_index_db) else: playback_index_db = None diff --git a/warcprox/playback.py b/warcprox/playback.py index 3ee2aaa..663e10a 100644 --- a/warcprox/playback.py +++ b/warcprox/playback.py @@ -210,7 +210,6 @@ class PlaybackProxyHandler(MitmProxyHandler): class PlaybackProxy(socketserver.ThreadingMixIn, http_server.HTTPServer): logger = logging.getLogger("warcprox.playback.PlaybackProxy") - def __init__(self, ca=None, playback_index_db=None, options=warcprox.Options()): server_address = (options.address or 'localhost', options.playback_port if options.playback_port is not None else 8001) http_server.HTTPServer.__init__(self, server_address, PlaybackProxyHandler, bind_and_activate=True) @@ -231,7 +230,7 @@ class PlaybackProxy(socketserver.ThreadingMixIn, http_server.HTTPServer): class PlaybackIndexDb(object): logger = logging.getLogger("warcprox.playback.PlaybackIndexDb") - def __init__(self, file='./warcprox.sqlite'): + def __init__(self, file='./warcprox.sqlite', options=warcprox.Options()): self.file = file self._lock = threading.RLock()