Update events handler, add mutex to push

2 files changed, 3 insertions, 3 deletions

diff --git a/pkg/pool/static_pool.go b/pkg/pool/static_pool.go
index 691290b2..6cc42143 100755
--- a/pkg/pool/static_pool.go
+++ b/pkg/pool/static_pool.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/interfaces/worker"
 	"github.com/spiral/roadrunner/v2/internal"
+	events2 "github.com/spiral/roadrunner/v2/pkg/events"
 	syncWorker "github.com/spiral/roadrunner/v2/pkg/worker"
 	workerWatcher "github.com/spiral/roadrunner/v2/pkg/worker_watcher"
-	"github.com/spiral/roadrunner/v2/util"
 )
 
 // StopRequest can be sent by worker to indicate that restart is required.
@@ -71,7 +71,7 @@ func NewPool(ctx context.Context, cmd func() *exec.Cmd, factory worker.Factory,
 		cfg:     cfg,
 		cmd:     cmd,
 		factory: factory,
-		events:  util.NewEventsHandler(),
+		events:  events2.NewEventsHandler(),
 		after:   make([]After, 0, 0),
 		before:  make([]Before, 0, 0),
 	}
diff --git a/pkg/pool/static_pool_test.go b/pkg/pool/static_pool_test.go
index 0794b8e6..dd33a1a6 100755
--- a/pkg/pool/static_pool_test.go
+++ b/pkg/pool/static_pool_test.go
@@ -175,7 +175,7 @@ func Test_StaticPool_Broken_Replace(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, p)
 
-	block := make(chan struct{})
+	block := make(chan struct{}, 1)
 
 	p.AddListener(func(event interface{}) {
 		if wev, ok := event.(events.WorkerEvent); ok {