Merge pull request #75 from mittwald/fix/listenerdeadlock

Fix deadlock on listener job + fix race
mittwald · Mar 13, 2024 · db0cf9a · db0cf9a
2 parents de8c9fc + 1cf3391
commit db0cf9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/proc/basejob.go b/pkg/proc/basejob.go
@@ -108,7 +108,7 @@ func (job *baseJob) startOnce(ctx context.Context, process chan<- *os.Process) e
 	defer job.closeStdFiles()
 
 	if err := job.CreateAndOpenStdFile(job.Config); err != nil {
-		return nil
+		return err
 	}
 
 	cmd := exec.Command(job.Config.Command, job.Config.Args...)

diff --git a/pkg/proc/job_lazy.go b/pkg/proc/job_lazy.go
@@ -42,6 +42,8 @@ func (job *LazyJob) AssertStarted(ctx context.Context) error {
 
 		l.Info("process terminated")
 
+		job.lazyStartLock.Lock()
+		defer job.lazyStartLock.Unlock()
 		job.process = nil
 	}()