Update to tick wait when it quick-fails

Resolves #210
pufferpanel · Mar 21, 2023 · db4e5aa · db4e5aa
1 parent a1c1c40
commit db4e5aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/environments/docker/docker.go b/environments/docker/docker.go
@@ -65,8 +65,6 @@ func (d *docker) dockerExecuteAsync(steps pufferpanel.ExecutionData) error {
 		return pufferpanel.ErrContainerRunning
 	}
 
-	d.Wait.Wait()
-
 	if d.downloadingImage {
 		return pufferpanel.ErrImageDownloading
 	}

diff --git a/environments/standard/standard.go b/environments/standard/standard.go
@@ -48,7 +48,7 @@ func (s *standard) standardExecuteAsync(steps pufferpanel.ExecutionData) (err er
 		err = pufferpanel.ErrProcessRunning
 		return
 	}
-	s.Wait.Wait()
+
 	s.Wait.Add(1)
 	s.mainProcess = exec.Command(steps.Command, steps.Arguments...)
 	s.mainProcess.Dir = path.Join(s.GetRootDirectory(), steps.WorkingDirectory)
@@ -67,6 +67,7 @@ func (s *standard) standardExecuteAsync(steps pufferpanel.ExecutionData) (err er
 	s.mainProcess.Stderr = wrapper
 	pipe, err := s.mainProcess.StdinPipe()
 	if err != nil {
+		s.Wait.Done()
 		return
 	}
 	s.stdInWriter = pipe
@@ -78,6 +79,7 @@ func (s *standard) standardExecuteAsync(steps pufferpanel.ExecutionData) (err er
 
 	err = s.mainProcess.Start()
 	if err != nil && err.Error() != "exit status 1" {
+		s.Wait.Done()
 		msg := messages.Status{Running: false}
 		_ = s.WSManager.WriteMessage(msg)
 		s.Log(logging.Info, "Process failed to start: %s", err)
@@ -189,7 +191,6 @@ func (s *standard) SendCode(code int) error {
 
 func (s *standard) handleClose(callback func(exitCode int)) {
 	err := s.mainProcess.Wait()
-	s.Wait.Done()
 
 	msg := messages.Status{Running: false}
 	_ = s.WSManager.WriteMessage(msg)
@@ -209,6 +210,8 @@ func (s *standard) handleClose(callback func(exitCode int)) {
 	s.mainProcess = nil
 	s.stdInWriter = nil
 
+	s.Wait.Done()
+
 	if callback != nil {
 		callback(exitCode)
 	}

diff --git a/environments/tty/tty.go b/environments/tty/tty.go
@@ -45,7 +45,6 @@ func (t *tty) ttyExecuteAsync(steps pufferpanel.ExecutionData) (err error) {
 		err = pufferpanel.ErrProcessRunning
 		return
 	}
-	t.Wait.Wait()
 
 	pr := exec.Command(steps.Command, steps.Arguments...)
 	pr.Dir = path.Join(t.GetRootDirectory(), steps.WorkingDirectory)
@@ -69,15 +68,16 @@ func (t *tty) ttyExecuteAsync(steps pufferpanel.ExecutionData) (err error) {
 	msg := messages.Status{Running: true}
 	_ = t.WSManager.WriteMessage(msg)
 
-	tty, err := pty.Start(pr)
+	processTty, err := pty.Start(pr)
 	if err != nil {
+		t.Wait.Done()
 		return
 	}
 
-	t.stdInWriter = tty
+	t.stdInWriter = processTty
 
 	go func(proxy io.Writer) {
-		_, _ = io.Copy(proxy, tty)
+		_, _ = io.Copy(proxy, processTty)
 	}(wrapper)
 
 	go t.handleClose(steps.Callback)