Browse Source

update RunCmd finally fixed

Matthew R. Kasun 3 years ago
parent
commit
c142096577
2 changed files with 3 additions and 10 deletions
  1. 1 3
      netclient/daemon/freebsd.go
  2. 2 7
      netclient/ncutils/netclientutils_freebsd.go

+ 1 - 3
netclient/daemon/freebsd.go

@@ -103,9 +103,7 @@ netclient_args="daemon"`
 }
 
 func FreebsdDaemon(command string) {
-	out, err := ncutils.RunCmdFormatted("service netclient "+command, true)
-	ncutils.Log("output from RunCmd " + out)
-	ncutils.Log("error from RunCmd " + err.Error())
+	_, _ = ncutils.RunCmdFormatted("service netclient "+command, true)
 }
 
 func CleanupFreebsd() {

+ 2 - 7
netclient/ncutils/netclientutils_freebsd.go

@@ -38,14 +38,9 @@ func RunCmd(command string, printerr bool) (string, error) {
 	cmd := exec.Command(args[0], args[1:]...)
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	go func() {
-		select {
-		case <-ctx.Done():
-			_ = syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
-		case <-time.After(time.Second * 2):
-			_ = syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
-		}
+		<-ctx.Done()
+		_ = syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
 	}()
-	cmd.Wait()
 	out, err := cmd.CombinedOutput()
 	if err != nil && printerr {
 		log.Println("error running command:", command)