a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- autohosts: fix crash on startup if filesystem watcher couldn't be initialized 

Close #1814

Squashed commit of the following:

commit ba17a5b3c61a8a5282beb0cca470e2302e83c0d6
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jun 19 10:08:44 2020 +0300

    - autohosts: fix crash on startup if filesystem watcher couldn't be initialized
This commit is contained in:
Simon Zolin 2020-06-19 14:27:23 +03:00
parent aa7b3c33d5
commit 2c47053cfe
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util/auto_hosts.go
View File

@ -76,17 +76,19 @@ func (a *AutoHosts) Start() {
go a.updateLoop() go a.updateLoop()
a.updateChan <- true a.updateChan <- true
go a.watcherLoop() if a.watcher != nil {
go a.watcherLoop()
err := a.watcher.Add(a.hostsFn) err := a.watcher.Add(a.hostsFn)
if err != nil {
log.Error("Error while initializing watcher for a file %s: %s", a.hostsFn, err)
}
for _, dir := range a.hostsDirs {
err = a.watcher.Add(dir)
if err != nil { if err != nil {
log.Error("Error while initializing watcher for a directory %s: %s", dir, err) log.Error("Error while initializing watcher for a file %s: %s", a.hostsFn, err)
}
for _, dir := range a.hostsDirs {
err = a.watcher.Add(dir)
if err != nil {
log.Error("Error while initializing watcher for a directory %s: %s", dir, err)
}
} }
} }
} }
@ -95,7 +97,9 @@ func (a *AutoHosts) Start() {
func (a *AutoHosts) Close() { func (a *AutoHosts) Close() {
a.updateChan <- false a.updateChan <- false
close(a.updateChan) close(a.updateChan)
_ = a.watcher.Close() if a.watcher != nil {
_ = a.watcher.Close()
}
} }
// update table // update table