Add waitgroup wait to keep plugin running until goroutine is ready

nginx · Sep 19, 2022 · c0ea8f8 · c0ea8f8
1 parent 9fe1f95
commit c0ea8f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/plugins/process_watcher.go b/src/plugins/process_watcher.go
@@ -62,6 +62,7 @@ func (pw *ProcessWatcher) Info() *core.Info {
 
 func (pw *ProcessWatcher) Close() {
 	log.Info("ProcessWatcher is wrapping up")
+	pw.wg.Wait()
 }
 
 func (pw *ProcessWatcher) Process(message *core.Message) {}

diff --git a/src/plugins/process_watcher_test.go b/src/plugins/process_watcher_test.go
@@ -155,9 +155,10 @@ func TestProcessWatcher_getProcUpdates(t *testing.T) {
 
 func TestProcessWatcher_Process(t *testing.T) {
 	env := tutils.GetMockEnvWithProcess()
-
 	pluginUnderTest := NewProcessWatcher(env, tutils.GetMockNginxBinary())
-	messagePipe := core.SetupMockMessagePipe(t, context.TODO(), pluginUnderTest)
+
+	ctx, cancel := context.WithCancel(context.TODO())
+	messagePipe := core.SetupMockMessagePipe(t, ctx, pluginUnderTest)
 
 	pluginUnderTest.Init(messagePipe)
 	messagePipe.Run()
@@ -173,6 +174,8 @@ func TestProcessWatcher_Process(t *testing.T) {
 		}
 	}
 
+	cancel()
+
 	pluginUnderTest.Close()
 }