Return watcher error

Author: everesio

pkg/libs/util/watcher.go

@@ -54,7 +54,7 @@ func watchFileForUpdates(filename string, done <-chan bool, action func()) error
 	filename = filepath.Clean(filename)
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		errors.Wrapf(err, "failed to create watcher for %s", filename)
+		return errors.Wrapf(err, "failed to create watcher for %s", filename)
 	}
 	go func() {
 		defer func() {
@@ -98,7 +98,7 @@ func watchLinkForUpdates(filename string, done <-chan bool, action func()) error
 	dirname := filepath.Dir(filename)
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		errors.Wrapf(err, "failed to create watcher for file %s in dir %s", filename, dirname)
+		return errors.Wrapf(err, "failed to create watcher for file %s in dir %s", filename, dirname)
 	}
 	go func() {
 		defer func() {

proxy/util_test.go

@@ -260,9 +260,9 @@ func makeTLSHttpProxyPipe(conf *config.Config, proxyusername, proxypassword stri
 		return nil, nil, nil, err
 	}
 	// Start a connection between two endpoints.
-	var err0, err1, err2 error
+	var err1, err2 error
 	go func() {
-		err0 = http.Serve(proxy, server)
+		http.Serve(proxy, server)
 	}()
 	done := make(chan bool)
 	go func() {