Skip to content
Permalink
Browse files

Use vendored Zookeeper libs

  • Loading branch information...
varunvarma committed Jun 10, 2019
1 parent 8335475 commit ff87aa0029f22b6324b054ef331398efa8a6738a
Showing with 9 additions and 11 deletions.
  1. +1 −3 .travis.yml
  2. +5 −6 tox.ini
  3. +3 −2 yahoo_panoptes/framework/plugins/panoptes_base_plugin.py
@@ -3,9 +3,7 @@ python:
- 2.7
before_install:
- sudo apt-get update
- sudo apt-get install -y openjdk-7-jdk libslf4j-java libsnmp30
- wget http://archive.apache.org/dist/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz
- tar -xzvf zookeeper-3.4.10.tar.gz
- sudo apt-get install -y openjdk-7-jdk
install:
- pip install --upgrade pip setuptools tox virtualenv coveralls
script:
11 tox.ini
@@ -4,7 +4,7 @@ package_dir = yahoo_panoptes

[tox]
skip_missing_interpreters = True
envlist = py27-{linux,macosx}
envlist = py27

[pep8]
max-line-length = 120
@@ -17,13 +17,12 @@ ignore = E722, E126
exclude = migrations

[testenv]
platform = linux: linux
macosx: darwin
passenv = HOME
setenv =
linux: ZOOKEEPER_CLASSPATH=zookeeper-3.4.10/zookeeper-3.4.10.jar:zookeeper-3.4.10/lib/log4j-1.2.16.jar:zookeeper-3.4.10/lib/slf4j-api-1.6.1.jar:zookeeper-3.4.10/lib/slf4j-log4j12-1.6.1.jar
macosx: ZOOKEEPER_CLASSPATH=/usr/local/Library/Java/zookeeper/zookeeper.jar:/usr/local/Library/Java/zookeeper/log4j.jar:/usr/local/Library/Java/zookeeper/slf4j-api.jar:/usr/local/Library/Java/zookeeper/slf4j-log4j12.jar
PYTHONHASHSEED=0
ZOOKEEPER_PATH=tests/zookeeper
ZOOKEEPER_CLASSPATH=tests/zookeeper/zookeeper-3.4.13.jar:tests/zookeeper/lib/log4j-1.2.17.jar:tests/zookeeper/lib/slf4j-api-1.7.25.jar:tests/zookeeper/lib/slf4j-log4j12-1.7.25.jar
ZOOKEEPER_VERSION=3.4.13
PYTHONHASHSEED=0
install_command =
{envpython} {envbindir}/pip install {opts} {packages}
deps =
@@ -108,7 +108,7 @@ def __repr__(self):
str(self.last_results),
str(self.last_results_key),
'Data object passed' if (self.data is not None) else 'None',
'Lock is set' if (self.lock is not None) else 'None')
'Lock is set' if (self.lock is not None or not lock.locked) else 'False')

def _get_key(self, suffix):
"""
@@ -539,7 +539,8 @@ def lock(self):
"""
lock_path = '/'.join([const.PLUGIN_AGENT_LOCK_PATH,
self.normalized_category,
'/plugins/lock/',
'plugins',
'lock',
self.normalized_name,
self.signature])

0 comments on commit ff87aa0

Please sign in to comment.
You can’t perform that action at this time.