fix systemd restart logic (#329)

* fix systemd restart logic

Signed-off-by: Brandon Peterson <[email protected]>

* add systemd rename handling

Signed-off-by: Brandon Peterson <[email protected]>

---------

Signed-off-by: Brandon Peterson <[email protected]>

Author: brandonp42

README.md

@@ -11,6 +11,7 @@ To develop and test changes of FetchIt, the FetchIt image can be built locally a
 
 ```
 go mod tidy
+go mod vendor
 podman build . --file Dockerfile --tag quay.io/fetchit/fetchit-amd:latest
 podman tag quay.io/fetchit/fetchit-amd:latest quay.io/fetchit/fetchit:latest
 ```

go.mod

@@ -242,7 +242,7 @@ require (
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/term v0.5.0 // indirect
 	golang.org/x/text v0.7.0 // indirect
-	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
+	golang.org/x/time v0.1.0 // indirect
 	golang.org/x/tools v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect

go.sum

@@ -3526,7 +3526,6 @@ golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
 golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=

pkg/engine/systemd.go

@@ -129,10 +129,28 @@ func (sd *Systemd) Process(ctx, conn context.Context, skew int) {
 }
 
 func (sd *Systemd) MethodEngine(ctx context.Context, conn context.Context, change *object.Change, path string) error {
+	var changeType string = "unknown"
+	var curr *string = nil
 	var prev *string = nil
 	if change != nil {
+		if change.From.Name != "" {
+			prev = &change.From.Name
+		}
 		if change.To.Name != "" {
-			prev = &change.To.Name
+			curr = &change.To.Name
+		}
+		if change.From.Name == "" && change.To.Name != "" {
+			changeType = "create"
+		}
+		if change.From.Name != "" && change.To.Name != "" {
+			if change.From.Name == change.To.Name {
+				changeType = "update"
+			} else {
+				changeType = "rename"
+			}
+		}
+		if change.From.Name != "" && change.To.Name == "" {
+			changeType = "delete"
 		}
 	}
 	nonRootHomeDir := os.Getenv("HOME")
@@ -148,7 +166,7 @@ func (sd *Systemd) MethodEngine(ctx context.Context, conn context.Context, chang
 	if change != nil {
 		sd.initialRun = true
 	}
-	return sd.systemdPodman(ctx, conn, path, dest, prev)
+	return sd.systemdPodman(ctx, conn, path, dest, prev, curr, &changeType)
 }
 
 func (sd *Systemd) Apply(ctx, conn context.Context, currentState, desiredState plumbing.Hash, tags *[]string) error {
@@ -162,7 +180,7 @@ func (sd *Systemd) Apply(ctx, conn context.Context, currentState, desiredState p
 	return nil
 }
 
-func (sd *Systemd) systemdPodman(ctx context.Context, conn context.Context, path, dest string, prev *string) error {
+func (sd *Systemd) systemdPodman(ctx context.Context, conn context.Context, path, dest string, prev *string, curr *string, changeType *string) error {
 	logger.Infof("Deploying systemd file(s) %s", path)
 	if sd.autoUpdateAll {
 		if !sd.initialRun {
@@ -187,14 +205,26 @@ func (sd *Systemd) systemdPodman(ctx context.Context, conn context.Context, path
 		logger.Infof("Systemd target %s successfully processed", sd.Name)
 		return nil
 	}
-	if (sd.Enable && !sd.Restart) || sd.initialRun {
-		if sd.Enable {
-			return sd.enableRestartSystemdService(conn, "enable", dest, filepath.Base(path))
+	if *changeType == "create" {
+		return sd.enableRestartSystemdService(conn, "enable", dest, filepath.Base(*curr))
+	}
+	if *changeType == "update" {
+		if sd.Restart {
+			return sd.enableRestartSystemdService(conn, "restart", dest, filepath.Base(*curr))
+		} else {
+			return sd.enableRestartSystemdService(conn, "enable", dest, filepath.Base(*curr))
 		}
 	}
-	if sd.Restart {
-		return sd.enableRestartSystemdService(conn, "restart", dest, filepath.Base(path))
+	if *changeType == "rename" {
+		if err := sd.enableRestartSystemdService(conn, "stop", dest, filepath.Base(*prev)); err != nil {
+			return err
+		}
+		return sd.enableRestartSystemdService(conn, "enable", dest, filepath.Base(*curr))
+	}
+	if *changeType == "delete" {
+		return sd.enableRestartSystemdService(conn, "stop", dest, filepath.Base(*prev))
 	}
+	logger.Infof("Systemd target %s %s not processed", sd.Name, *changeType)
 	return nil
 }