Skip to content

Redirect LOG_FD also when suppressing log messages #669

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

Open
lmagyar wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

Redirect LOG_FD also when suppressing log messages #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tailscale/rootfs/etc/s6-overlay/s6-rc.d/forwarding/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function setup_forwarding() {
fi
}

if ! bashio::api.supervisor GET "/network/interface/default/info" false &> /dev/null; then
if ! eval "bashio::api.supervisor GET /network/interface/default/info false &> /dev/null ${LOG_FD}> /dev/null"; then
Comment thread
lmagyar marked this conversation as resolved.
bashio::log.warning \
"The host has no primary (default) interface, can't forward incoming tailnet connections to the host." \
"Restart of the app is required after the issue is fixed!"
Expand Down
2 changes: 1 addition & 1 deletion tailscale/rootfs/etc/s6-overlay/s6-rc.d/local-network/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ declare wait_counter=0
# They can mark this service as dependency, and wait for the successful startup.

# Until HA has no default interface, we wait a little
while ! bashio::api.supervisor GET "/network/interface/default/info" false &> /dev/null; do
while ! eval "bashio::api.supervisor GET /network/interface/default/info false &> /dev/null ${LOG_FD}> /dev/null"; do
if (( wait_counter++ == WAIT_COUNT )); then
# We emit only a warning to let the app start, maybe this is the only connection to access the device, better to start than not.
# Let Tailscale figure out a way to connect to the tailnet if the local network is temporarily down.
Expand Down
4 changes: 2 additions & 2 deletions tailscale/rootfs/usr/bin/protect-subnet-routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ if [[ "${1-}" != "tested" ]]; then
# It is possible to get "ERROR: Got unexpected response from the API: System is not ready with state: setup"
# Test both networking and config Supervisor API availability, these APIs are called in subnet-routes script
# And wait a little on inaccessibility
while ! bashio::api.supervisor GET "/network/interface/default/info" false &> /dev/null || \
! bashio::api.supervisor GET "/addons/self/options/config" false &> /dev/null
while ! eval "bashio::api.supervisor GET /network/interface/default/info false &> /dev/null ${LOG_FD}> /dev/null" || \
! eval "bashio::api.supervisor GET /addons/self/options/config false &> /dev/null ${LOG_FD}> /dev/null"
do
if (( wait_counter++ == WAIT_COUNT )); then
bashio::exit.nok "Supervisor is unreachable"
Expand Down
Loading