Fix race condition in signal handling

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

1 files changed, 16 insertions, 7 deletions

diff --git a/plugins.go b/plugins.go
index 4beedd3a..789fca96 100644
--- a/plugins.go
+++ b/plugins.go
@@ -85,19 +85,28 @@ func (p *plugin) run(args ...interface{}) (interface{}, error) {
 	outBuf := &bytes.Buffer{}
 	c.Stdout = outBuf
 
+	start := time.Now()
+	err := c.Start()
+	if err != nil {
+		return nil, err
+	}
+
 	// make sure all signals are propagated
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs)
 	go func() {
-		// Pass signals to the sub-process
-		sig := <-sigs
-		if c.Process != nil {
-			// nolint: gosec
-			_ = c.Process.Signal(sig)
+		select {
+		case sig := <-sigs:
+			// Pass signals to the sub-process
+			if c.Process != nil {
+				// nolint: gosec
+				_ = c.Process.Signal(sig)
+			}
+		case <-ctx.Done():
 		}
 	}()
-	start := time.Now()
-	err := c.Run()
+
+	err = c.Wait()
 	elapsed := time.Since(start)
 
 	if ctx.Err() != nil {