From a838194b99c329f1ffd0272e99445a406e3c39cc Mon Sep 17 00:00:00 2001 From: Wolfy-J Date: Thu, 7 Jan 2021 16:44:51 +0300 Subject: - fixes bug when pool does not propagate events to given listeners --- plugins/server/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/server/plugin.go') diff --git a/plugins/server/plugin.go b/plugins/server/plugin.go index 5d1f26d3..613d84ed 100644 --- a/plugins/server/plugin.go +++ b/plugins/server/plugin.go @@ -131,8 +131,8 @@ func (server *Plugin) NewWorkerPool(ctx context.Context, opt poolImpl.Config, en return nil, errors.E(op, err) } - list := make([]events.Listener, 0, len(listeners)) - list = append(list, server.collectPoolLogs) + list := make([]events.Listener, 0, len(listeners)+1) + list = append(listeners, server.collectPoolLogs) p, err := poolImpl.Initialize(ctx, spawnCmd, server.factory, opt, poolImpl.AddListeners(list...)) if err != nil { -- cgit v1.2.3 From 14ecff0ba0e54a1ff73f140a76da58c1b3a20a6d Mon Sep 17 00:00:00 2001 From: Wolfy-J Date: Thu, 7 Jan 2021 22:23:12 +0300 Subject: - fixes listeners merge --- plugins/server/plugin.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'plugins/server/plugin.go') diff --git a/plugins/server/plugin.go b/plugins/server/plugin.go index 613d84ed..cb7b08b8 100644 --- a/plugins/server/plugin.go +++ b/plugins/server/plugin.go @@ -131,8 +131,11 @@ func (server *Plugin) NewWorkerPool(ctx context.Context, opt poolImpl.Config, en return nil, errors.E(op, err) } - list := make([]events.Listener, 0, len(listeners)+1) - list = append(listeners, server.collectPoolLogs) + list := make([]events.Listener, 0, 1) + list = append(list, server.collectPoolLogs) + if len(listeners) != 0 { + list = append(list, listeners...) + } p, err := poolImpl.Initialize(ctx, spawnCmd, server.factory, opt, poolImpl.AddListeners(list...)) if err != nil { -- cgit v1.2.3