From 99fb92d7491c5a19de74a877d888f0f754d2cef6 Mon Sep 17 00:00:00 2001 From: dcore94 Date: Wed, 12 May 2021 15:47:15 +0200 Subject: [PATCH] adapted to 3.0.4 --- conductor/conductor.py | 13 +++++++------ docker/base/entrypoint.sh | 6 +++--- docker/provisioning/entrypoint.sh | 6 +++--- entrypoint.sh | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/conductor/conductor.py b/conductor/conductor.py index a47f46d..4ae2ff3 100644 --- a/conductor/conductor.py +++ b/conductor/conductor.py @@ -215,12 +215,13 @@ class TaskClient(BaseClient): return None def ackTask(self, taskId, workerid): - url = self.makeUrl('{}/ack', taskId) - params = {} - params['workerid'] = workerid - headers = {'Accept': 'application/json'} - value = self.post(url, params, None, headers) - return value in ['true', True] + #url = self.makeUrl('{}/ack', taskId) + #params = {} + #params['workerid'] = workerid + #headers = {'Accept': 'application/json'} + #value = self.post(url, params, None, headers) + #return value in ['true', True] + return True def getTasksInQueue(self, taskName): url = self.makeUrl('queue/{}', taskName) diff --git a/docker/base/entrypoint.sh b/docker/base/entrypoint.sh index 7d44ed0..6659bdc 100755 --- a/docker/base/entrypoint.sh +++ b/docker/base/entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/bash -export BASE=${CONDUCTOR_SERVER:-http://conductorserver:8080/api} +export HEALTH=${CONDUCTOR_HEALTH:-http://conductor-server:8080/health} -echo 'Waiting for Conductor at ' $BASE '...' +echo 'Waiting for Conductor at ' $HEALTH '...' -while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $BASE/health)" != 200 ]]; do +while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $HEALTH)" != 200 ]]; do echo 'still waiting ...' sleep 5 done diff --git a/docker/provisioning/entrypoint.sh b/docker/provisioning/entrypoint.sh index 832068e..e8449ea 100755 --- a/docker/provisioning/entrypoint.sh +++ b/docker/provisioning/entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/bash -export BASE=${CONDUCTOR_SERVER:-http://conductorserver:8080/api} +export HEALTH=${CONDUCTOR_HEALTH:-http://conductor-server:8080/health} -echo 'Waiting for Conductor at ' $BASE ' ...' +echo 'Waiting for Conductor at ' $HEALTH ' ...' -while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $BASE/health)" != 200 ]]; do +while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $HEALTH)" != 200 ]]; do echo 'still waiting ...' sleep 5 done diff --git a/entrypoint.sh b/entrypoint.sh index 86c64a1..1af3e57 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -export BASE="http://conductorserver:8080/api" +export BASE="http://conductorserver:8080" echo 'Waiting for Conductor ...'