From 979bb719fbab5d1c1b737d0c4ed4e3e4645ec696 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Tue, 15 Feb 2022 17:34:45 +0300 Subject: [PATCH] deps: update dependencies --- go.mod | 6 +++--- go.sum | 11 ++++++----- handler/handler.go | 4 ++-- handler/request.go | 2 +- handler/response.go | 2 +- plugin.go | 14 ++++++++------ 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index b9a02db..6ff14b5 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ require ( github.com/goccy/go-json v0.9.4 github.com/mholt/acmez v1.0.2 github.com/prometheus/client_golang v1.12.1 - github.com/roadrunner-server/api/v2 v2.8.0 + github.com/roadrunner-server/api/v2 v2.9.0 github.com/roadrunner-server/endure v1.2.1 github.com/roadrunner-server/errors v1.1.1 github.com/roadrunner-server/goridge/v3 v3.3.1 - github.com/roadrunner-server/sdk/v2 v2.8.1 + github.com/roadrunner-server/sdk/v2 v2.9.1 github.com/stretchr/testify v1.7.0 go.uber.org/zap v1.21.0 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd @@ -45,7 +45,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect - golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index 58a6c82..a2c5e69 100644 --- a/go.sum +++ b/go.sum @@ -210,8 +210,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/roadrunner-server/api/v2 v2.8.0 h1:fok4BipCNot+gduxvIWGcadA2+lGGK9h6pQD+VPjTns= -github.com/roadrunner-server/api/v2 v2.8.0/go.mod h1:oBcessyxeXlyR3WRCUcMtNwS98Hv2lRBBracjAgN+DI= +github.com/roadrunner-server/api/v2 v2.9.0 h1:bTv6xxrr5YhD7HXN78O8D+tylcl1eVjdseaHx3K19rY= +github.com/roadrunner-server/api/v2 v2.9.0/go.mod h1:jQ0rWRiuVozw4G8ASgx0YEwxDqMOD4NdestaJanPcM0= github.com/roadrunner-server/endure v1.2.1 h1:LwapekBTGlsgEXR6Fbp50WYIjAGq/FwTssZThemyawE= github.com/roadrunner-server/endure v1.2.1/go.mod h1:36kWruojFlPhtsP/is8wVtWGYuGGxUWDVnn1TTBbbas= github.com/roadrunner-server/errors v1.1.0/go.mod h1:MzHjhRZIZc1ooMyYllUhNs0aTqRUbwcgUSO0TN7kCII= @@ -219,8 +219,8 @@ github.com/roadrunner-server/errors v1.1.1 h1:BzrB+xZE+iTISVfXSzIL9YbpPt6oHoRHgO github.com/roadrunner-server/errors v1.1.1/go.mod h1:MzHjhRZIZc1ooMyYllUhNs0aTqRUbwcgUSO0TN7kCII= github.com/roadrunner-server/goridge/v3 v3.3.1 h1:IYdm+smDfKl09AfFgKJeSNpSTp7KTgO3XfGPKrxs0vQ= github.com/roadrunner-server/goridge/v3 v3.3.1/go.mod h1:f7SPSt9HUw5kbCc6Ofk4eEUU1xh2qHf/NznrTaW+aLA= -github.com/roadrunner-server/sdk/v2 v2.8.1 h1:QneTXD31gBmiEV5q+Cd4yDgoPCkKJZj+zrV1PLXp6dM= -github.com/roadrunner-server/sdk/v2 v2.8.1/go.mod h1:oqohHdPseV3P3woXk3H1XUnU8YeprC63O8wRmjCkP5Q= +github.com/roadrunner-server/sdk/v2 v2.9.1 h1:TOIOLCWQ5kenQgg3XnFqgCXnTsHrPqO/kp9RgIWW/wI= +github.com/roadrunner-server/sdk/v2 v2.9.1/go.mod h1:rDLsNXHdpbPGkHIVA7JoLEIHlFc6ydCwOsOpGdfuYfI= github.com/roadrunner-server/tcplisten v1.1.1 h1:uVJVdg/zaasD2A4Mg+GyMlsUy2nLp9ADKec/REzql9Y= github.com/roadrunner-server/tcplisten v1.1.1/go.mod h1:2MjzsggdgxCca4p2k3YJdWdo/QnQehiOTy0knlE226c= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -287,6 +287,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 h1:EuGTJDfeg/PGZJp3gq1K+14eSLFTsrj1eg8KQuiUyKg= golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -421,7 +423,6 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/handler/handler.go b/handler/handler.go index c3b94fd..6b6a572 100644 --- a/handler/handler.go +++ b/handler/handler.go @@ -9,12 +9,12 @@ import ( "sync" "time" + "github.com/roadrunner-server/api/v2/payload" + "github.com/roadrunner-server/api/v2/pool" "github.com/roadrunner-server/errors" "github.com/roadrunner-server/goridge/v3/pkg/frame" "github.com/roadrunner-server/http/v2/attributes" "github.com/roadrunner-server/http/v2/config" - "github.com/roadrunner-server/sdk/v2/payload" - "github.com/roadrunner-server/sdk/v2/pool" "go.uber.org/zap" ) diff --git a/handler/request.go b/handler/request.go index 4dbe3ee..353a829 100644 --- a/handler/request.go +++ b/handler/request.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/goccy/go-json" + "github.com/roadrunner-server/api/v2/payload" "github.com/roadrunner-server/errors" - "github.com/roadrunner-server/sdk/v2/payload" "go.uber.org/zap" ) diff --git a/handler/response.go b/handler/response.go index 563d912..01dc638 100644 --- a/handler/response.go +++ b/handler/response.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/goccy/go-json" - "github.com/roadrunner-server/sdk/v2/payload" + "github.com/roadrunner-server/api/v2/payload" ) const ( diff --git a/plugin.go b/plugin.go index 0b2bab3..9e78081 100644 --- a/plugin.go +++ b/plugin.go @@ -13,13 +13,15 @@ import ( "github.com/roadrunner-server/api/v2/plugins/middleware" "github.com/roadrunner-server/api/v2/plugins/server" "github.com/roadrunner-server/api/v2/plugins/status" + "github.com/roadrunner-server/api/v2/pool" + "github.com/roadrunner-server/api/v2/state/process" + "github.com/roadrunner-server/api/v2/worker" endure "github.com/roadrunner-server/endure/pkg/container" "github.com/roadrunner-server/errors" httpConfig "github.com/roadrunner-server/http/v2/config" "github.com/roadrunner-server/http/v2/handler" - "github.com/roadrunner-server/sdk/v2/pool" - "github.com/roadrunner-server/sdk/v2/state/process" - "github.com/roadrunner-server/sdk/v2/worker" + poolImpl "github.com/roadrunner-server/sdk/v2/pool" + pstate "github.com/roadrunner-server/sdk/v2/state/process" "go.uber.org/zap" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" @@ -124,14 +126,14 @@ func (p *Plugin) Serve() chan error { func (p *Plugin) serve(errCh chan error) { //nolint:gocyclo var err error - p.pool, err = p.server.NewWorkerPool(context.Background(), &pool.Config{ + p.pool, err = p.server.NewWorkerPool(context.Background(), &poolImpl.Config{ Debug: p.cfg.Pool.Debug, NumWorkers: p.cfg.Pool.NumWorkers, MaxJobs: p.cfg.Pool.MaxJobs, AllocateTimeout: p.cfg.Pool.AllocateTimeout, DestroyTimeout: p.cfg.Pool.DestroyTimeout, Supervisor: p.cfg.Pool.Supervisor, - }, p.cfg.Env) + }, p.cfg.Env, p.log) if err != nil { errCh <- err return @@ -307,7 +309,7 @@ func (p *Plugin) Workers() []*process.State { ps := make([]*process.State, 0, len(workers)) for i := 0; i < len(workers); i++ { - state, err := process.WorkerProcessState(workers[i]) + state, err := pstate.WorkerProcessState(workers[i]) if err != nil { return nil }