diff --git a/setup.py b/setup.py index e90ac5f..242d5b6 100755 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ except: setuptools.setup( name='warcprox', - version='2.3.1b4.dev137', + version='2.3.1b4.dev138', 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 065bd63..1369204 100644 --- a/warcprox/main.py +++ b/warcprox/main.py @@ -215,8 +215,6 @@ def init_controller(args): exit(1) listeners = [] - running_stats = warcprox.stats.RunningStats() - listeners.append(running_stats) if args.rethinkdb_dedup_url: dedup_db = warcprox.dedup.RethinkDedupDb(options=options) @@ -254,7 +252,8 @@ def init_controller(args): proxy = warcprox.warcproxy.WarcProxy( ca=ca, recorded_url_q=recorded_url_q, stats_db=stats_db, - running_stats=running_stats, options=options) + options=options) + listeners.append(proxy.running_stats) if args.playback_port is not None: playback_index_db = warcprox.playback.PlaybackIndexDb( diff --git a/warcprox/warcproxy.py b/warcprox/warcproxy.py index 6f7dd34..31b9b45 100644 --- a/warcprox/warcproxy.py +++ b/warcprox/warcproxy.py @@ -451,7 +451,7 @@ class WarcProxy(SingleThreadedWarcProxy, warcprox.mitmproxy.PooledMitmProxy): def __init__( self, ca=None, recorded_url_q=None, stats_db=None, - running_stats=None, options=warcprox.Options()): + options=warcprox.Options()): if options.max_threads: self.logger.info( "max_threads=%s set by command line option",