Make the wait-for-port timeout adjustable (#9)

* Make the wait-for-port timeout adjustable

Signed-off-by: Dmitriy Shmatov <dsh@ip-192-168-88-10.ec2.internal>
Signed-off-by: Dmitriy Shmatov <dsh@ip-10-0-1-57.ec2.internal>

* Apply double quotes suggestions

Signed-off-by: Dmitriy Shmatov <dsh@ip-10-0-1-57.ec2.internal>

Co-authored-by: Dmitriy Shmatov <dsh@ip-192-168-88-10.ec2.internal>
Co-authored-by: Dmitriy Shmatov <dsh@ip-10-0-1-57.ec2.internal>
This commit is contained in:
Shmatov Dmitriy
2022-01-28 11:32:06 +02:00
committed by GitHub
parent 85e015daf1
commit f78d97ea35
2 changed files with 6 additions and 4 deletions

View File

@@ -44,6 +44,7 @@ export INFLUXDB_HTTP_PORT_NUMBER="${INFLUXDB_HTTP_PORT_NUMBER:-8086}"
export INFLUXDB_HTTP_BIND_ADDRESS="${INFLUXDB_HTTP_BIND_ADDRESS:-0.0.0.0:${INFLUXDB_HTTP_PORT_NUMBER}}"
export INFLUXDB_HTTP_READINESS_TIMEOUT="${INFLUXDB_HTTP_READINESS_TIMEOUT:-60}"
export INFLUXDB_PORT_NUMBER="${INFLUXDB_PORT_NUMBER:-8088}"
export INFLUXDB_PORT_READINESS_TIMEOUT="${INFLUXDB_PORT_READINESS_TIMEOUT:-30}"
export INFLUXDB_BIND_ADDRESS="${INFLUXDB_BIND_ADDRESS:-0.0.0.0:${INFLUXDB_PORT_NUMBER}}"
# Authentication
export INFLUXDB_ADMIN_USER="${INFLUXDB_ADMIN_USER:-admin}"
@@ -411,8 +412,8 @@ influxdb_start_bg_noauth() {
INFLUXDB_HTTP_HTTPS_ENABLED=false INFLUXDB_HTTP_BIND_ADDRESS="127.0.0.1:${INFLUXDB_HTTP_PORT_NUMBER}" debug_execute "${start_command[@]}" &
# branch 2 does not lisent on this port
[[ "${branch}" = "1" ]] && wait-for-port "$INFLUXDB_PORT_NUMBER"
wait-for-port "$INFLUXDB_HTTP_PORT_NUMBER"
[[ "${branch}" = "1" ]] && wait-for-port --timeout="$INFLUXDB_PORT_READINESS_TIMEOUT" "$INFLUXDB_PORT_NUMBER"
wait-for-port --timeout="$INFLUXDB_PORT_READINESS_TIMEOUT" "$INFLUXDB_HTTP_PORT_NUMBER"
wait-for-influxdb
}

View File

@@ -44,6 +44,7 @@ export INFLUXDB_HTTP_PORT_NUMBER="${INFLUXDB_HTTP_PORT_NUMBER:-8086}"
export INFLUXDB_HTTP_BIND_ADDRESS="${INFLUXDB_HTTP_BIND_ADDRESS:-0.0.0.0:${INFLUXDB_HTTP_PORT_NUMBER}}"
export INFLUXDB_HTTP_READINESS_TIMEOUT="${INFLUXDB_HTTP_READINESS_TIMEOUT:-60}"
export INFLUXDB_PORT_NUMBER="${INFLUXDB_PORT_NUMBER:-8088}"
export INFLUXDB_PORT_READINESS_TIMEOUT="${INFLUXDB_PORT_READINESS_TIMEOUT:-30}"
export INFLUXDB_BIND_ADDRESS="${INFLUXDB_BIND_ADDRESS:-0.0.0.0:${INFLUXDB_PORT_NUMBER}}"
# Authentication
export INFLUXDB_ADMIN_USER="${INFLUXDB_ADMIN_USER:-admin}"
@@ -411,8 +412,8 @@ influxdb_start_bg_noauth() {
INFLUXDB_HTTP_HTTPS_ENABLED=false INFLUXDB_HTTP_BIND_ADDRESS="127.0.0.1:${INFLUXDB_HTTP_PORT_NUMBER}" debug_execute "${start_command[@]}" &
# branch 2 does not lisent on this port
[[ "${branch}" = "1" ]] && wait-for-port "$INFLUXDB_PORT_NUMBER"
wait-for-port "$INFLUXDB_HTTP_PORT_NUMBER"
[[ "${branch}" = "1" ]] && wait-for-port --timeout="$INFLUXDB_PORT_READINESS_TIMEOUT" "$INFLUXDB_PORT_NUMBER"
wait-for-port --timeout="$INFLUXDB_PORT_READINESS_TIMEOUT" "$INFLUXDB_HTTP_PORT_NUMBER"
wait-for-influxdb
}