Docker: limited the waiting time for control socket creation.
While at it, fixed a typo.
This commit is contained in:
@@ -29,7 +29,14 @@ if [ "$1" = "unitd" ] || [ "$1" = "unitd-debug" ]; then
|
|||||||
echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..."
|
echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..."
|
||||||
/usr/sbin/$1 --control unix:/var/run/control.unit.sock
|
/usr/sbin/$1 --control unix:/var/run/control.unit.sock
|
||||||
|
|
||||||
while [ ! -S /var/run/control.unit.sock ]; do echo "$0: Waiting for control socket to be created..."; /bin/sleep 0.1; done
|
for i in $(/usr/bin/seq $WAITLOOPS); do
|
||||||
|
if [ ! -S /var/run/control.unit.sock ]; then
|
||||||
|
echo "$0: Waiting for control socket to be created..."
|
||||||
|
/bin/sleep $SLEEPSEC
|
||||||
|
else
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
# even when the control socket exists, it does not mean unit has finished initialisation
|
# even when the control socket exists, it does not mean unit has finished initialisation
|
||||||
# this curl call will get a reply once unit is fully launched
|
# this curl call will get a reply once unit is fully launched
|
||||||
/usr/bin/curl -s -X GET --unix-socket /var/run/control.unit.sock http://localhost/
|
/usr/bin/curl -s -X GET --unix-socket /var/run/control.unit.sock http://localhost/
|
||||||
@@ -62,7 +69,7 @@ if [ "$1" = "unitd" ] || [ "$1" = "unitd-debug" ]; then
|
|||||||
|
|
||||||
for i in $(/usr/bin/seq $WAITLOOPS); do
|
for i in $(/usr/bin/seq $WAITLOOPS); do
|
||||||
if [ -S /var/run/control.unit.sock ]; then
|
if [ -S /var/run/control.unit.sock ]; then
|
||||||
echo "$0 Waiting for control socket to be removed..."
|
echo "$0: Waiting for control socket to be removed..."
|
||||||
/bin/sleep $SLEEPSEC
|
/bin/sleep $SLEEPSEC
|
||||||
else
|
else
|
||||||
break
|
break
|
||||||
|
|||||||
Reference in New Issue
Block a user