From 884d1938e64b463591b50d261fc3d374d409c786 Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Wed, 27 Jul 2022 17:28:32 -0400
Subject: [PATCH] moved if/else to correct function

---
 netclient/daemon/common.go | 25 +++++++++++++------------
 netclient/ncutils/pid.go   | 19 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/netclient/daemon/common.go b/netclient/daemon/common.go
index 6e8930d6..6c03f807 100644
--- a/netclient/daemon/common.go
+++ b/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
diff --git a/netclient/ncutils/pid.go b/netclient/ncutils/pid.go
index 522c12d3..24cf300d 100644
--- a/netclient/ncutils/pid.go
+++ b/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
 }