safebox/proxy-scheduler
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor bugfixes.

Browse Source
This commit is contained in:
Gyorgy Berenyi
2021-09-03 06:50:34 +00:00
parent 6388f36687
commit eb82f0a86b
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/check_certificates.sh
View File

@@ -15,10 +15,12 @@ service_exec="docker run --rm \
letsencrypt_certificates() { letsencrypt_certificates() {
echo "XYZ: "$PROXY_SERVICE_FILE" "$ROLE local RUNNING_CONTAINERS;
cd /
# Check services with running containers by roles # Check services with running containers by roles
for CONTAINER in $(jq -r --arg ROLE $ROLE '.containers[] | select(.ROLES==$ROLE)' $PROXY_SERVICE_FILE | jq -r .NAME) ; do for CONTAINER in $(jq -r --arg ROLE $ROLE '.containers[] | select(.ROLES==$ROLE)' /$PROXY_SERVICE_FILE | jq -r .NAME) ; do
UP=$(docker ps | grep $CONTAINER | grep Up | wc -l) UP=$(docker ps | grep $CONTAINER | grep Up | wc -l)
RUNNING_CONTAINERS=$((RUNNING_CONTAINERS + UP)) RUNNING_CONTAINERS=$((RUNNING_CONTAINERS + UP))
done; done;

18
scripts/check_proxy_state.sh
View File

@@ -30,7 +30,7 @@ do_proxy_restart() {
for retries in $(seq 0 $((RESTART + 1))); do for retries in $(seq 0 $((RESTART + 1))); do
if [[ $retries -le $RESTART ]] ; then if [[ $retries -le $RESTART ]] ; then
echo "Proxy "$PROXY_NAME" restarting in progress"; echo "Proxy "$PROXY_NAME" restarting in progress";
docker stop $proxies; docker stop $PROXY_NAME;
sleep $TIMEOUT; sleep $TIMEOUT;
$service_exec $SERVICE_NAME.containers.$PROXY_NAME start $service_exec $SERVICE_NAME.containers.$PROXY_NAME start
if docker ps | grep $PROXY_NAME ; then if docker ps | grep $PROXY_NAME ; then
@@ -95,23 +95,27 @@ if [[ "$RUNNING_CONTAINERS" == "$CONTAINERS_BY_ROLE" || "$RUNNING_CONTAINERS" -g
elif [[ "$RUNNING_CONTAINERS" -eq 0 ]] ; then elif [[ "$RUNNING_CONTAINERS" -eq 0 ]] ; then
echo "No running proxies found, starting all"; echo "No running proxies found, starting all";
$service_exec /services/$SERVICE_NAME.json stop;
$service_exec /services/$SERVICE_NAME.json start; $service_exec /services/$SERVICE_NAME.json start;
for proxies in $CONTAINERS ; do for proxies in $CONTAINERS ; do
if docker ps | grep $proxies ; then if docker ps | grep $proxies ; then
echo "$proxies started successful"; echo "$proxies started successful";
else else
echo "$proxies starting was unsuccesful" echo "$proxies starting was unsuccesful"
fi fi
done done
# In case of only one running proxy found, try to start the others of the service # In case of only one running proxy found, try to start the others of the service
elif [[ "$RUNNING_CONTAINERS" -eq 1 ]] ; then elif [[ "$RUNNING_CONTAINERS" -eq 1 ]] ; then
echo "Only one running proxy found, starting all of the others"; echo "Only one running proxy found, starting all of the others";
for proxies in $CONTAINERS ; do for proxies in $CONTAINERS ; do
if [[ $proxies != $CONTAINER_NAMES ]] ; then if [[ $proxies != $CONTAINER_NAMES ]] ; then
echo "No running containers: "$proxies" found."; echo "No running containers: "$proxies" found.";
$service_exec $SERVICE_NAME.containers.$proxies start;
do_proxy_restart $proxies;
if docker ps | grep $proxies ; then if docker ps | grep $proxies ; then
echo "$proxies started successful"; echo "$proxies started successful";
else else