From ac543ee5b634b50226ad315bf56157197e15a037 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Tue, 23 May 2017 11:33:04 -0700 Subject: [PATCH] use "ttl" for updated doublethink svc reg api --- brozzler/worker.py | 2 +- setup.py | 4 ++-- vagrant/run-tests.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/brozzler/worker.py b/brozzler/worker.py index 6623ed0..6cf6cd7 100644 --- a/brozzler/worker.py +++ b/brozzler/worker.py @@ -494,7 +494,7 @@ class BrozzlerWorker: else: status_info = { "role": "brozzler-worker", - "heartbeat_interval": self.HEARTBEAT_INTERVAL, + "ttl": self.HEARTBEAT_INTERVAL * 3, } status_info["load"] = 1.0 * self._browser_pool.num_in_use() / self._browser_pool.size status_info["browser_pool_size"] = self._browser_pool.size diff --git a/setup.py b/setup.py index 3491ba2..b82406a 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ setuptools.setup( 'websocket-client!=0.39.0', 'pillow==3.3.0', 'urlcanon>=0.1.dev16', - 'doublethink>=0.2.0.dev71', + 'doublethink>=0.2.0.dev81', 'rethinkdb>=2.3,<2.4', 'cerberus==1.0.1', 'jinja2', @@ -78,7 +78,7 @@ setuptools.setup( extras_require={ 'dashboard': ['flask>=0.11', 'gunicorn'], 'easy': [ - 'warcprox>=2.1b1.dev60', + 'warcprox>=2.1b1.dev86', 'pywb', 'flask>=0.11', 'gunicorn' diff --git a/vagrant/run-tests.sh b/vagrant/run-tests.sh index 978ef7d..8126e7d 100755 --- a/vagrant/run-tests.sh +++ b/vagrant/run-tests.sh @@ -17,5 +17,5 @@ vagrant ssh -- 'status warcprox ; status vnc-websock' echo -vagrant ssh -- 'set -x ; source /opt/brozzler-ve34/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev71"' +vagrant ssh -- 'set -x ; source /opt/brozzler-ve34/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev86"' vagrant ssh -- "source /opt/brozzler-ve34/bin/activate && DISPLAY=:1 py.test -v /brozzler/tests $@"