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 predictable id in service registry

Browse Source 
so that when warcprox restarts it replaces the obsolete entry
This commit is contained in:
Noah Levitt 2018-11-12 15:11:23 -08:00
parent 4f836e9179
commit bb50a6c7ff
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -40,7 +40,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.4b3.dev190', version='2.4b3.dev191',
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

@ -1576,8 +1576,11 @@ def test_svcreg_status(warcprox_):
'rates_15min', 'active_requests','start_time','urls_processed', 'rates_15min', 'active_requests','start_time','urls_processed',
'warc_bytes_written', 'postfetch_chain', 'warc_bytes_written', 'postfetch_chain',
'earliest_still_active_fetch_start',} 'earliest_still_active_fetch_start',}
assert status['id'] == 'warcprox:%s:%s' % (
socket.gethostname(), warcprox_.proxy.server_port)
assert status['role'] == 'warcprox' assert status['role'] == 'warcprox'
assert status['version'] == warcprox.__version__ assert status['version'] == warcprox.__version__
assert status['host'] == socket.gethostname()
assert status['port'] == warcprox_.proxy.server_port assert status['port'] == warcprox_.proxy.server_port
assert status['pid'] == os.getpid() assert status['pid'] == os.getpid()
assert status['threads'] == warcprox_.proxy.pool._max_workers assert status['threads'] == warcprox_.proxy.pool._max_workers

5
warcprox/controller.py
View File

@ -36,6 +36,7 @@ import functools
import doublethink import doublethink
import importlib import importlib
import queue import queue
import socket
class Factory: class Factory:
@staticmethod @staticmethod
@ -319,13 +320,15 @@ class WarcproxController(object):
status_info = self.status_info status_info = self.status_info
else: else:
status_info = { status_info = {
'id': 'warcprox:%s:%s' % (
socket.gethostname(), self.proxy.server_port),
'role': 'warcprox', 'role': 'warcprox',
'version': warcprox.__version__, 'version': warcprox.__version__,
'ttl': self.HEARTBEAT_INTERVAL * 3, 'ttl': self.HEARTBEAT_INTERVAL * 3,
'host': socket.gethostname(),
'port': self.proxy.server_port, 'port': self.proxy.server_port,
} }
status_info.update(self.proxy.status()) status_info.update(self.proxy.status())
self.status_info = self.service_registry.heartbeat(status_info) self.status_info = self.service_registry.heartbeat(status_info)
self.logger.trace('status in service registry: %s', self.status_info) self.logger.trace('status in service registry: %s', self.status_info)