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

…nitialized
eoghan2t9 · Jun 19, 2020 · ba17a5b · ba17a5b
1 parent aa7b3c3
commit ba17a5b
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/util/auto_hosts.go b/util/auto_hosts.go
@@ -76,17 +76,19 @@ func (a *AutoHosts) Start() {
 	go a.updateLoop()
 	a.updateChan <- true
 
-	go a.watcherLoop()
+	if a.watcher != nil {
+		go a.watcherLoop()
 
-	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)
+		err := a.watcher.Add(a.hostsFn)
 		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() {
 	a.updateChan <- false
 	close(a.updateChan)
-	_ = a.watcher.Close()
+	if a.watcher != nil {
+		_ = a.watcher.Close()
+	}
 }
 
 // update table