c-l/docker-adsb-ultrafeeder
1
0
Fork 0
mirror of https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git synced 2024-11-21 13:20:11 +00:00
Code Releases Activity

move adsb.lol station map check out of interpret_ultrafeeder_config (#159)

Browse source 
this script is sourced by multiple scripts and we only need to do show
the station map URL once

also curl has long maximum timeouts which can block important services
from starting up if there is an issue with adsb.lol or the network / DNS
This commit is contained in:
Fred Clausen 2024-11-10 12:11:08 -07:00 committed by GitHub
commit 245b69e875
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
rootfs/etc/s6-overlay/s6-rc.d/aggregator-urls/dependencies.d/startup Normal file
View file

2
rootfs/etc/s6-overlay/s6-rc.d/aggregator-urls/run Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
exec /etc/s6-overlay/scripts/aggregator-urls

1
rootfs/etc/s6-overlay/s6-rc.d/aggregator-urls/type Normal file
View file

@ -0,0 +1 @@
longrun

0
rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/aggregator-urls Normal file
View file

34
rootfs/etc/s6-overlay/scripts/aggregator-urls Executable file
View file

@ -0,0 +1,34 @@
#!/command/with-contenv bash
# shellcheck shell=bash disable=SC2015,SC2016,SC1091
#---------------------------------------------------------------------------------------------
# Copyright (C) 2023-2024, Ramon F. Kolb (kx1t) and contributors
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with this program.
# If not, see <https://www.gnu.org/licenses/>.
#---------------------------------------------------------------------------------------------
source /scripts/common
source /scripts/interpret_ultrafeeder_config
# wait 30 seconds for connections to be established
sleep 30
if [[ "${READSB_CONF_ARR[*]}" =~ "in.adsb.lol" ]]; then
myadsblol="$(curl -sLD - https://my.adsb.lol -o /dev/null -w '%{url_effective}' 2>&1 | sed '/location: /h;g;$!d;s/^.* \(.*\)$/\1/')"
if [[ -n "$myadsblol" ]] && [[ ! $myadsblol =~ sorry-but-i-could-not-find-your-receiver ]]; then
"${s6wrap[@]}" echo "ADSB.LOL station map available at $myadsblol"
fi
fi
# one shots have weird behaviour, just use longrun and stop the service once this is done
stop_service

8
rootfs/scripts/interpret_ultrafeeder_config
View file

@ -97,14 +97,6 @@ do
done done
# Now add $readsb_str to the READSB_CONF_ARR() as --net-connector argument: # Now add $readsb_str to the READSB_CONF_ARR() as --net-connector argument:
READSB_CONF_ARR+=("--net-connector=${readsb_str}") READSB_CONF_ARR+=("--net-connector=${readsb_str}")
if [[ ${param[1],,} == "in.adsb.lol" ]]; then
myadsblol="$(curl -sLD - https://my.adsb.lol -o /dev/null -w '%{url_effective}' 2>&1 | sed '/location: /h;g;$!d;s/^.* \(.*\)$/\1/')"
if [[ -n "$myadsblol" ]] && [[ ! $myadsblol =~ sorry-but-i-could-not-find-your-receiver ]]; then
"${s6wrap[@]}" echo "ADSB.LOL station map available at $myadsblol"
fi
fi
;; ;;
mlat) mlat)