Refactor the way the proxy is configured. Job/site settings "proxy" and "enable_warcprox_features" are gone. Brozzler-worker now has mutually exclusive options --proxy and --warcprox-auto. --warcprox-auto means find an instance of warcprox in the service registry, and enable warcprox features. --proxy is provided, determines if proxy is warcprox by consulting http://{proxy_address}/status (see 8caae0d7d3), and enables warcprox features if so.

This commit is contained in:
Noah Levitt 2017-03-24 13:55:23 -07:00
parent 9a2f181eb6
commit 934190084c
14 changed files with 208 additions and 153 deletions

View file

@ -314,9 +314,7 @@ def test_field_defaults():
# site
brozzler.Site.table_ensure(rr)
site = brozzler.Site(rr, {
'seed': 'http://example.com/', 'enable_warcprox_features': True})
assert site.enable_warcprox_features is True
site = brozzler.Site(rr, {'seed': 'http://example.com/'})
assert site.id is None
assert site.scope
assert site.scope['surt'] == 'http://(com,example,)/'
@ -325,15 +323,12 @@ def test_field_defaults():
assert site.scope
tite = brozzler.Site.load(rr, site.id)
assert tite.enable_warcprox_features is True
assert tite.id == site.id
assert tite.scope == site.scope
tite.save()
assert tite.enable_warcprox_features is True
assert tite.id == site.id
assert tite.scope == site.scope
tite.refresh()
assert tite.enable_warcprox_features is True
assert tite.id == site.id
assert tite.scope == site.scope