Bugfix/missed events (#10) (#11)

* Bugfix/missed events (#10)

* go 21 upgrade

* add watch on deleted files before starting the new process

* add mutex to avoid race conditions

* Fix 403 Forbidden in push to ghcr

---------

Co-authored-by: Norwin Schnyder <[email protected]>

* Remove mutex

---------

Co-authored-by: Andy Baer <[email protected]>

Author: snorwin

go.mod

@@ -1,7 +1,7 @@
 module github.com/snorwin/haproxy-reload-wrapper
 
-go 1.17
+go 1.21
 
-require github.com/fsnotify/fsnotify v1.6.0
+require github.com/fsnotify/fsnotify v1.7.0
 
-require golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
+require golang.org/x/sys v0.4.0 // indirect

go.sum

@@ -1,4 +1,4 @@
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

main.go

@@ -60,20 +60,31 @@ func main() {
 			if !(isWrite(event) || isRemove(event) || isCreate(event)) {
 				continue
 			}
+
 			log.Notice(fmt.Sprintf("fs event for file %s : %v", cfgFile, event.Op))
 
+			// re-add watch if file was removed - config maps are updated by removing/adding a symlink
+			if isRemove(event) {
+				if err := fswatch.Add(cfgFile); err != nil {
+					log.Alert(fmt.Sprintf("watch file failed : %v", err))
+				} else {
+					log.Notice(fmt.Sprintf("watch file : %s", cfgFile))
+				}
+			}
+
 			// create a new haproxy process which will replace the old one after it was successfully started
 			tmp := exec.Command(executable, append([]string{"-x", utils.LookupHAProxySocketPath(), "-sf", strconv.Itoa(cmd.Process.Pid)}, os.Args[1:]...)...)
 			tmp.Stdout = os.Stdout
 			tmp.Stderr = os.Stderr
 			tmp.Env = utils.LoadEnvFile()
+
 			if err := tmp.AsyncRun(); err != nil {
 				log.Warning(err.Error())
 				log.Warning("reload failed")
 				continue
 			}
-			log.Notice(fmt.Sprintf("process %d started", tmp.Process.Pid))
 
+			log.Notice(fmt.Sprintf("process %d started", tmp.Process.Pid))
 			select {
 			case <-cmd.Terminated:
 				// old haproxy terminated - successfully started a new process replacing the old one
@@ -85,16 +96,6 @@ func main() {
 				log.Warning(fmt.Sprintf("process %d terminated unexpectedly : %s", tmp.Process.Pid, tmp.Status()))
 				log.Warning("reload failed")
 			}
-
-			// re-add watch if file was removed - config maps are updated by removing/adding a symlink
-			if isRemove(event) {
-				if err := fswatch.Add(cfgFile); err != nil {
-					log.Alert(fmt.Sprintf("watch file failed : %v", err))
-					continue
-				}
-
-				log.Notice(fmt.Sprintf("watch file : %s", cfgFile))
-			}
 		case err := <-fswatch.Errors:
 			// handle errors of fsnotify.Watcher
 			log.Alert(err.Error())