Handle case when waiting is killed, which throws error

Fixes #67
pufferpanel · Sep 10, 2018 · 2d4cbf8 · 2d4cbf8
1 parent 2f744b1
commit 2d4cbf8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/environments/standard.go b/environments/standard.go
@@ -75,10 +75,14 @@ func (s *standard) standardExecuteAsync(cmd string, args []string, env map[strin
 	logging.Debugf("Starting process: %s %s", s.mainProcess.Path, strings.Join(s.mainProcess.Args, " "))
 	err = s.mainProcess.Start()
 	go func() {
-		s.mainProcess.Wait()
+		err := s.mainProcess.Wait()
 		s.wait.Done()
 		if callback != nil {
-			callback(s.mainProcess.ProcessState.Success())
+			if s.mainProcess == nil || s.mainProcess.ProcessState == nil || err != nil  {
+				callback(false)
+			} else {
+				callback(s.mainProcess.ProcessState.Success())
+			}
 		}
 	}()
 	if err != nil && err.Error() != "exit status 1" {

diff --git a/environments/tty.go b/environments/tty.go
@@ -76,10 +76,10 @@ func (s *tty) ttyExecuteAsync(cmd string, args []string, env map[string]string,
 	s.stdInWriter = tty
 	go func() {
 		io.Copy(wrapper, tty)
-		process.Wait()
+		err = process.Wait()
 		s.wait.Done()
 		if callback != nil {
-			if s.mainProcess == nil || s.mainProcess.ProcessState == nil {
+			if s.mainProcess == nil || s.mainProcess.ProcessState == nil || err != nil  {
 				callback(false)
 			} else {
 				callback(s.mainProcess.ProcessState.Success())