Fixed bug in start script with jitsi
This commit is contained in:
parent
5187408cb1
commit
7ae905c791
@ -21,11 +21,9 @@ startservice_jitsi() {
|
|||||||
RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
||||||
start_service_withalert "jitsi" "$NC_COMMAND" "$RETRY" "no"
|
start_service_withalert "jitsi" "$NC_COMMAND" "$RETRY" "no"
|
||||||
|
|
||||||
if [ "$FAILED" = "no" ]; then
|
|
||||||
disown $SPINPID &> /dev/null
|
disown $SPINPID &> /dev/null
|
||||||
kill -9 $SPINPID &> /dev/null
|
kill -9 $SPINPID &> /dev/null
|
||||||
echo -ne "done.\n"
|
echo -ne "done.\n"
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
spin &
|
spin &
|
||||||
SPINPID=$!
|
SPINPID=$!
|
||||||
@ -34,13 +32,11 @@ startservice_jitsi() {
|
|||||||
RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
||||||
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
|
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
|
||||||
|
|
||||||
if [ "$FAILED" = "no" ]; then
|
|
||||||
disown $SPINPID &> /dev/null
|
disown $SPINPID &> /dev/null
|
||||||
kill -9 $SPINPID &> /dev/null
|
kill -9 $SPINPID &> /dev/null
|
||||||
echo -ne "done.\n"
|
echo -ne "done.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
startservice() {
|
startservice() {
|
||||||
if [ "$(docker container inspect -f '{{.State.Status}}' $SERVICE 2>/dev/null)" = "running" ]; then
|
if [ "$(docker container inspect -f '{{.State.Status}}' $SERVICE 2>/dev/null)" = "running" ]; then
|
||||||
@ -100,14 +96,12 @@ startservice_all() {
|
|||||||
RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
|
RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
|
||||||
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
|
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
|
||||||
|
|
||||||
if [ "$FAILED" = "no" ]; then
|
|
||||||
disown $SPINPID &> /dev/null
|
disown $SPINPID &> /dev/null
|
||||||
kill -9 $SPINPID &> /dev/null
|
kill -9 $SPINPID &> /dev/null
|
||||||
echo -ne "done.\n"
|
echo -ne "done.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user