1 files changed, 16 insertions, 27 deletions
diff --git a/plugins/server/plugin.go b/plugins/server/plugin.go
index 00639f43..1694cdf1 100644
--- a/plugins/server/plugin.go
+++ b/plugins/server/plugin.go
@@ -21,14 +21,14 @@ import (
 	"github.com/spiral/roadrunner/v2/utils"
 )
 
-// PluginName for the server
-const PluginName = "server"
-
-// RrRelay env variable key (internal)
-const RrRelay = "RR_RELAY"
-
-// RrRPC env variable key (internal) if the RPC presents
-const RrRPC = "RR_RPC"
+const (
+	// PluginName for the server
+	PluginName = "server"
+	// RrRelay env variable key (internal)
+	RrRelay = "RR_RELAY"
+	// RrRPC env variable key (internal) if the RPC presents
+	RrRPC = "RR_RPC"
+)
 
 // Plugin manages worker
 type Plugin struct {
@@ -124,7 +124,7 @@ func (server *Plugin) NewWorker(ctx context.Context, env Env, listeners ...event
 	const op = errors.Op("server_plugin_new_worker")
 
 	list := make([]events.Listener, 0, len(listeners))
-	list = append(list, server.collectWorkerLogs)
+	list = append(list, server.collectWorkerEvents)
 
 	spawnCmd, err := server.CmdFactory(env)
 	if err != nil {
@@ -140,15 +140,16 @@ func (server *Plugin) NewWorker(ctx context.Context, env Env, listeners ...event
 }
 
 // NewWorkerPool issues new worker pool.
-func (server *Plugin) NewWorkerPool(ctx context.Context, opt pool.Config, env Env, listeners ...events.Listener) (pool.Pool, error) {
+func (server *Plugin) NewWorkerPool(ctx context.Context, opt *pool.Config, env Env, listeners ...events.Listener) (pool.Pool, error) {
 	const op = errors.Op("server_plugin_new_worker_pool")
+
 	spawnCmd, err := server.CmdFactory(env)
 	if err != nil {
 		return nil, errors.E(op, err)
 	}
 
-	list := make([]events.Listener, 0, 1)
-	list = append(list, server.collectEvents)
+	list := make([]events.Listener, 0, 2)
+	list = append(list, server.collectPoolEvents, server.collectWorkerEvents)
 	if len(listeners) != 0 {
 		list = append(list, listeners...)
 	}
@@ -209,7 +210,7 @@ func (server *Plugin) setEnv(e Env) []string {
 	return env
 }
 
-func (server *Plugin) collectEvents(event interface{}) {
+func (server *Plugin) collectPoolEvents(event interface{}) {
 	if we, ok := event.(events.PoolEvent); ok {
 		switch we.Event {
 		case events.EventMaxMemory:
@@ -238,7 +239,9 @@ func (server *Plugin) collectEvents(event interface{}) {
 			server.log.Warn("requested pool restart")
 		}
 	}
+}
 
+func (server *Plugin) collectWorkerEvents(event interface{}) {
 	if we, ok := event.(events.WorkerEvent); ok {
 		switch we.Event {
 		case events.EventWorkerError:
@@ -263,17 +266,3 @@ func (server *Plugin) collectEvents(event interface{}) {
 		}
 	}
 }
-
-func (server *Plugin) collectWorkerLogs(event interface{}) {
-	if we, ok := event.(events.WorkerEvent); ok {
-		switch we.Event {
-		case events.EventWorkerError:
-			server.log.Error(strings.TrimRight(we.Payload.(error).Error(), " \n\t"))
-		case events.EventWorkerLog:
-			server.log.Debug(strings.TrimRight(utils.AsString(we.Payload.([]byte)), " \n\t"))
-			// stderr event is INFO level
-		case events.EventWorkerStderr:
-			server.log.Info(strings.TrimRight(utils.AsString(we.Payload.([]byte)), " \n\t"))
-		}
-	}
-}