Browse Source

moved if/else to correct function

afeiszli 3 years ago
parent
commit
884d1938e6
2 changed files with 22 additions and 22 deletions
  1. 13 12
      netclient/daemon/common.go
  2. 9 10
      netclient/ncutils/pid.go

+ 13 - 12
netclient/daemon/common.go

@@ -36,19 +36,20 @@ func Restart() error {
 	if ncutils.IsWindows() {
 		RestartWindowsDaemon()
 		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

+ 9 - 10
netclient/ncutils/pid.go

@@ -33,15 +33,14 @@ func SavePID() error {
 func ReadPID() (int, error) {
 	if IsWindows() {
 		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
 }