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

use "ttl" for updated doublethink svc reg api

Browse Source
This commit is contained in:
Noah Levitt 2017-05-23 10:37:39 -07:00
parent aca0b881c6
commit 99dd840d20
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -41,7 +41,7 @@ deps = [
'warctools', 'warctools',
'kafka-python>=1.0.1', 'kafka-python>=1.0.1',
'urlcanon>=0.1.dev16', 'urlcanon>=0.1.dev16',
'doublethink>=0.2.0.dev69', 'doublethink>=0.2.0.dev81',
'PySocks', 'PySocks',
] ]
try: try:
@ -51,7 +51,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.1b1.dev85', version='2.1b1.dev86',
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',

3
tests/test_warcprox.py
View File

@ -1326,8 +1326,7 @@ def test_svcreg_status(warcprox_, service_registry):
assert set(status.keys()) == { assert set(status.keys()) == {
'id', 'role', 'version', 'host', 'port', 'pid', 'load', 'id', 'role', 'version', 'host', 'port', 'pid', 'load',
'queued_urls', 'queue_max_size', 'seconds_behind', 'queued_urls', 'queue_max_size', 'seconds_behind',
'first_heartbeat', 'heartbeat_interval', 'last_heartbeat', 'first_heartbeat', 'ttl', 'last_heartbeat', 'threads'}
'threads'}
assert status['role'] == 'warcprox' assert status['role'] == 'warcprox'
assert status['version'] == warcprox.__version__ assert status['version'] == warcprox.__version__
assert status['port'] == warcprox_.proxy.server_port assert status['port'] == warcprox_.proxy.server_port

2
warcprox/controller.py
View File

@ -146,7 +146,7 @@ class WarcproxController(object):
status_info = { status_info = {
'role': 'warcprox', 'role': 'warcprox',
'version': warcprox.__version__, 'version': warcprox.__version__,
'heartbeat_interval': self.HEARTBEAT_INTERVAL, 'ttl': self.HEARTBEAT_INTERVAL * 3,
'port': self.proxy.server_port, 'port': self.proxy.server_port,
} }
status_info['load'] = 1.0 * self.proxy.recorded_url_q.qsize() / ( status_info['load'] = 1.0 * self.proxy.recorded_url_q.qsize() / (