Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-04-21 16:16:28 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into qa

Browse Source 
* master:
  use "ttl" for updated doublethink svc reg api
This commit is contained in:
Noah Levitt 2017-05-23 11:35:19 -07:00
commit f0b9020c0a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brozzler/worker.py
View File

@ -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

4
setup.py
View File

@ -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'

2
vagrant/run-tests.sh
View File

@ -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 $@"