mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request: all: fix race, imp scripts
Merge in DNS/adguard-home from fix-race to master Squashed commit of the following: commit dff47c707554f689cf131e0ab3fe05df4e4b6a51 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri May 21 19:12:06 2021 +0300 all: fix race, imp scripts
This commit is contained in:
parent
6847f7c8bb
commit
52e6a63d8c
@ -121,7 +121,9 @@ func (ehc *EtcHostsContainer) Close() {
|
||||
if ehc.watcher != nil {
|
||||
_ = ehc.watcher.Close()
|
||||
}
|
||||
close(ehc.onlyWritesChan)
|
||||
|
||||
// Don't close onlyWritesChan here and let onlyWrites close it after
|
||||
// watcher.Events is closed to prevent close races.
|
||||
}
|
||||
|
||||
// Process returns the list of IP addresses for the hostname or nil if nothing
|
||||
@ -298,6 +300,8 @@ func (ehc *EtcHostsContainer) onlyWrites() {
|
||||
ehc.onlyWritesChan <- event
|
||||
}
|
||||
}
|
||||
|
||||
close(ehc.onlyWritesChan)
|
||||
}
|
||||
|
||||
// Receive notifications from fsnotify package
|
||||
|
@ -27,8 +27,6 @@ else
|
||||
fi
|
||||
readonly version
|
||||
|
||||
echo $version
|
||||
|
||||
# Allow users to use sudo.
|
||||
sudo_cmd="${SUDO:-}"
|
||||
readonly sudo_cmd
|
||||
|
@ -11,9 +11,8 @@ fi
|
||||
set -e -f -u
|
||||
|
||||
dist_dir="$DIST_DIR"
|
||||
go="${GO:-go}"
|
||||
sudo_cmd="${SUDO:-}"
|
||||
readonly dist_dir go sudo_cmd
|
||||
readonly dist_dir sudo_cmd
|
||||
|
||||
$sudo_cmd rm -f\
|
||||
./AdGuardHome\
|
||||
|
@ -136,7 +136,7 @@ exit_on_output() (
|
||||
then
|
||||
if [ "$*" != '' ]
|
||||
then
|
||||
echo "combined output of '$cmd $@':"
|
||||
echo "combined output of '$cmd $*':"
|
||||
else
|
||||
echo "combined output of '$cmd':"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user