diff --git a/setup.py b/setup.py index 445250e..0f8ba4c 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ deps = [ 'warctools', 'kafka-python>=1.0.1', 'urlcanon>=0.1.dev16', - 'doublethink>=0.2.0.dev69', + 'doublethink>=0.2.0.dev81', 'PySocks', ] try: @@ -51,7 +51,7 @@ except: setuptools.setup( name='warcprox', - version='2.1b1.dev85', + version='2.1b1.dev86', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/tests/test_warcprox.py b/tests/test_warcprox.py index 9fcbd03..c226ae3 100755 --- a/tests/test_warcprox.py +++ b/tests/test_warcprox.py @@ -1326,8 +1326,7 @@ def test_svcreg_status(warcprox_, service_registry): assert set(status.keys()) == { 'id', 'role', 'version', 'host', 'port', 'pid', 'load', 'queued_urls', 'queue_max_size', 'seconds_behind', - 'first_heartbeat', 'heartbeat_interval', 'last_heartbeat', - 'threads'} + 'first_heartbeat', 'ttl', 'last_heartbeat', 'threads'} assert status['role'] == 'warcprox' assert status['version'] == warcprox.__version__ assert status['port'] == warcprox_.proxy.server_port diff --git a/warcprox/controller.py b/warcprox/controller.py index b0882e3..00f5eb7 100644 --- a/warcprox/controller.py +++ b/warcprox/controller.py @@ -146,7 +146,7 @@ class WarcproxController(object): status_info = { 'role': 'warcprox', 'version': warcprox.__version__, - 'heartbeat_interval': self.HEARTBEAT_INTERVAL, + 'ttl': self.HEARTBEAT_INTERVAL * 3, 'port': self.proxy.server_port, } status_info['load'] = 1.0 * self.proxy.recorded_url_q.qsize() / (