Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix healthcheck failing in dual stack network when resolving hostname #231

Merged
merged 2 commits into from
Aug 30, 2023
Merged

Fix healthcheck failing in dual stack network when resolving hostname #231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa012b9
Update healthcheck.sh
CerebralXor Jul 29, 2023
a5953fb
Be a bit more explicit in resolving an IPv4 address
CerebralXor Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rootfs/scripts/healthcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function get_ip() {
>&2 echo "DEBUG: Already IP"
fi
# Attempt to resolve $1 into an IP address with getent
elif IP=$(getent hosts "$1" 2> /dev/null | cut -d ' ' -f 1); then
elif IP=$(getent ahostsv4 "$1" 2> /dev/null | grep -P '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+STREAM' | cut -d ' ' -f 1); then
:
if [[ -n "$VERBOSE_LOGGING" ]]; then
>&2 echo "DEBUG: Got IP via getent"
Expand Down Expand Up @@ -66,12 +66,12 @@ function is_tcp_connection_established() {
# Only need to do this if networking is enabled
if [[ -n "$READSB_NET_ENABLE" ]]; then
if [[ -n "$READSB_NET_CONNECTOR" ]]; then

# Loop through each given net-connector
IFS=';' read -r -a READSB_NET_CONNECTOR_ARRAY <<< "$READSB_NET_CONNECTOR"
for NET_CONNECTOR_ELEMENT in "${READSB_NET_CONNECTOR_ARRAY[@]}"
do

# Separate into IP / PORT
NET_CONNECTOR_ELEMENT_IP=$(get_ip "$(echo "$NET_CONNECTOR_ELEMENT" | cut -d ',' -f 1)")
NET_CONNECTOR_ELEMENT_PORT=$(echo "$NET_CONNECTOR_ELEMENT" | cut -d ',' -f 2)
Expand All @@ -86,7 +86,7 @@ if [[ -n "$READSB_NET_ENABLE" ]]; then
done
fi
fi
# If InfluxDB
# If InfluxDB
if [[ -n "$INFLUXDBURL" ]]; then
INFLUXDB_HOST=$(echo "$INFLUXDBURL" | sed -rn 's;https{0,1}:\/\/(.*):([[:digit:]]+).*$;\1;p')
INFLUXDB_PORT=$(echo "$INFLUXDBURL" | sed -rn 's;https{0,1}:\/\/(.*):([[:digit:]]+).*$;\2;p')
Expand Down Expand Up @@ -153,4 +153,4 @@ for service in "${services[@]}"; do
fi
done

exit 0
exit 0
Loading