diff --git a/root/app/dispatcher.sh b/root/app/dispatcher.sh index 9f4fda1..8bfd70a 100644 --- a/root/app/dispatcher.sh +++ b/root/app/dispatcher.sh @@ -8,6 +8,7 @@ DISKOVER_ARRAY[TODAY]=$(date +%Y-%m-%d) DISKOVER_ARRAY[INDEX_PREFIX]=${INDEX_PREFIX:-diskover-} DISKOVER_ARRAY[INDEX_NAME]=${INDEX_NAME:-${DISKOVER_ARRAY[INDEX_PREFIX]}${DISKOVER_ARRAY[TODAY]}} DISKOVER_ARRAY[DISKOVER_OPTS]=${DISKOVER_OPTS:-"-d /data -a"} +DISKOVER_ARRAY[WORKER_OPTS]=${WORKER_OPTS:-""} DISKOVER_ARRAY[REDIS_HOST]=${REDIS_HOST:-redis} DISKOVER_ARRAY[REDIS_PORT]=${REDIS_PORT:-6379} @@ -15,21 +16,7 @@ DISKOVER_ARRAY[DISKOVER_OPTS]="${DISKOVER_ARRAY[DISKOVER_OPTS]} -i ${DISKOVER_AR cd /app/diskover || exit -# killing existing workers before starting new ones -echo "killing existing workers..." -if [ -f "/tmp/diskover_bot_pids" ]; then - /bin/bash /app/diskover/diskover-bot-launcher.sh -k > /dev/null 2>&1 - sleep 3 -fi - -# empty existing redis queue -echo "emptying current redis queues..." -rq empty -u redis://${DISKOVER_ARRAY[REDIS_HOST]}:${DISKOVER_ARRAY[REDIS_PORT]} diskover_crawl diskover diskover_calcdir failed -sleep 3 - -echo "killing dangling workers..." -/bin/bash /app/diskover/diskover-bot-launcher.sh -k > /dev/null 2>&1 -sleep 3 +/bin/bash /app/cleanup.sh echo "starting workers with following options: ${DISKOVER_ARRAY[WORKER_OPTS]}" /bin/bash /app/diskover/diskover-bot-launcher.sh ${DISKOVER_ARRAY[WORKER_OPTS]}