gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-10 16:50:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

moved if/else to correct function

Browse source
This commit is contained in:
afeiszli 2022-07-27 17:28:32 -04:00
parent c35aec1eb7
commit 884d1938e6
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
netclient/daemon/common.go
View file

@ -36,19 +36,20 @@ func Restart() error {
if ncutils.IsWindows() { if ncutils.IsWindows() {
RestartWindowsDaemon() RestartWindowsDaemon()
return nil return nil
} else {
pid, err := ncutils.ReadPID()
if err != nil {
return fmt.Errorf("failed to find pid %w", err)
}
p, err := os.FindProcess(pid)
if err != nil {
return fmt.Errorf("failed to find running process for pid %d -- %w", pid, err)
}
if err := p.Signal(syscall.SIGHUP); err != nil {
return fmt.Errorf("SIGHUP failed -- %w", err)
}
return nil
} }
pid, err := ncutils.ReadPID()
if err != nil {
return fmt.Errorf("failed to find pid %w", err)
}
p, err := os.FindProcess(pid)
if err != nil {
return fmt.Errorf("failed to find running process for pid %d -- %w", pid, err)
}
if err := p.Signal(syscall.SIGHUP); err != nil {
return fmt.Errorf("SIGHUP failed -- %w", err)
}
return nil
} }
// Start - starts system daemon // Start - starts system daemon

19
netclient/ncutils/pid.go
View file

@ -33,15 +33,14 @@ func SavePID() error {
func ReadPID() (int, error) { func ReadPID() (int, error) {
if IsWindows() { if IsWindows() {
return 0, &WindowsPIDError{} return 0, &WindowsPIDError{}
} else {
bytes, err := os.ReadFile(PIDFILE)
if err != nil {
return 0, fmt.Errorf("could not read pid file %w", err)
}
pid, err := strconv.Atoi(string(bytes))
if err != nil {
return 0, fmt.Errorf("pid file contents invalid %w", err)
}
return pid, nil
} }
bytes, err := os.ReadFile(PIDFILE)
if err != nil {
return 0, fmt.Errorf("could not read pid file %w", err)
}
pid, err := strconv.Atoi(string(bytes))
if err != nil {
return 0, fmt.Errorf("pid file contents invalid %w", err)
}
return pid, nil
} }