Skip to content

Commit

Permalink
fix: duplicate systemd errs and reload-daemon before start
Browse files Browse the repository at this point in the history
  • Loading branch information
jmelahman committed Dec 1, 2024
1 parent 28350d5 commit 2da6958
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
11 changes: 7 additions & 4 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ func uninstallServices(obj dbus.BusObject) error {

for _, service := range services {
if err := systemd.DisableUnitFiles(obj, []string{service}); err != nil {
return fmt.Errorf("failed to disable %s: %v", service, err)
return err
}
if err := systemd.StopUnit(obj, service); err != nil {
return fmt.Errorf("failed to stop %s: %v", service, err)
return err
}
}
return nil
Expand All @@ -165,12 +165,15 @@ func installService(obj dbus.BusObject, configDir string, service systemd.Servic
}

if err := systemd.EnableUnitFiles(obj, []string{service.Name}); err != nil {
return fmt.Errorf("failed to enable service %s: %v", service.Name, err)
return err
}

if service.Start {
if err := systemd.ReloadDaemon(obj); err != nil {
return err
}
if err := systemd.StartUnit(obj, service.Name); err != nil {
return fmt.Errorf("failed to start service %s: %v", service.Name, err)
return err
}
}
return nil
Expand Down
8 changes: 8 additions & 0 deletions client/systemd/systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ type ServiceConfig struct {
TimerContent string
}

func ReloadDaemon(obj dbus.BusObject) error {
err := obj.Call("org.freedesktop.systemd1.Manager.Reload", 0).Store()
if err != nil {
return fmt.Errorf("Failed to reload daemon: %v", err)
}
return nil
}

func EnableUnitFiles(obj dbus.BusObject, files []string) error {
var enableChanged bool
result := make([][]interface{}, 0)
Expand Down

0 comments on commit 2da6958

Please sign in to comment.