diff options
| author | Valery Piashchynski <[email protected]> | 2020-12-20 18:28:46 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2020-12-20 18:28:46 +0300 |
| commit | f4a36c7f684216fb408693a6c494486144df57cf (patch) | |
| tree | e1b61bf7e74cb63aa45f9ca0284a4cffe8e06b0e /plugins/server | |
| parent | fbd5adde5abae6f7adb7fcdafc226bcd3480d498 (diff) | |
| parent | a10d20d20e910ed8fcfbc3bc690aaf17ee338ff3 (diff) | |
Merge remote-tracking branch 'origin/2.0' into plugin/redis
# Conflicts:
# go.sum
# pkg/pipe/pipe_factory_test.go
# pkg/pool/static_pool.go
# plugins/rpc/plugin.go
Diffstat (limited to 'plugins/server')
| -rw-r--r-- | plugins/server/tests/plugin_pipes.go | 4 | ||||
| -rw-r--r-- | plugins/server/tests/plugin_sockets.go | 4 | ||||
| -rw-r--r-- | plugins/server/tests/plugin_tcp.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/server/tests/plugin_pipes.go b/plugins/server/tests/plugin_pipes.go index f613cf98..9d7812a8 100644 --- a/plugins/server/tests/plugin_pipes.go +++ b/plugins/server/tests/plugin_pipes.go @@ -8,7 +8,7 @@ import ( config2 "github.com/spiral/roadrunner/v2/interfaces/config" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/interfaces/server" - "github.com/spiral/roadrunner/v2/internal" + "github.com/spiral/roadrunner/v2/pkg/payload" poolImpl "github.com/spiral/roadrunner/v2/pkg/pool" "github.com/spiral/roadrunner/v2/pkg/worker" plugin "github.com/spiral/roadrunner/v2/plugins/server" @@ -47,7 +47,7 @@ func (f *Foo) Serve() chan error { const op = errors.Op("serve") // test payload for echo - r := internal.Payload{ + r := payload.Payload{ Context: nil, Body: []byte(Response), } diff --git a/plugins/server/tests/plugin_sockets.go b/plugins/server/tests/plugin_sockets.go index 72b4d1a8..e5b139d4 100644 --- a/plugins/server/tests/plugin_sockets.go +++ b/plugins/server/tests/plugin_sockets.go @@ -7,7 +7,7 @@ import ( config2 "github.com/spiral/roadrunner/v2/interfaces/config" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/interfaces/server" - "github.com/spiral/roadrunner/v2/internal" + "github.com/spiral/roadrunner/v2/pkg/payload" "github.com/spiral/roadrunner/v2/pkg/worker" plugin "github.com/spiral/roadrunner/v2/plugins/server" ) @@ -31,7 +31,7 @@ func (f *Foo2) Serve() chan error { conf := &plugin.Config{} // test payload for echo - r := internal.Payload{ + r := payload.Payload{ Context: nil, Body: []byte(Response), } diff --git a/plugins/server/tests/plugin_tcp.go b/plugins/server/tests/plugin_tcp.go index aa741deb..866116a7 100644 --- a/plugins/server/tests/plugin_tcp.go +++ b/plugins/server/tests/plugin_tcp.go @@ -7,7 +7,7 @@ import ( config2 "github.com/spiral/roadrunner/v2/interfaces/config" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/interfaces/server" - "github.com/spiral/roadrunner/v2/internal" + "github.com/spiral/roadrunner/v2/pkg/payload" "github.com/spiral/roadrunner/v2/pkg/worker" plugin "github.com/spiral/roadrunner/v2/plugins/server" ) @@ -31,7 +31,7 @@ func (f *Foo3) Serve() chan error { conf := &plugin.Config{} // test payload for echo - r := internal.Payload{ + r := payload.Payload{ Context: nil, Body: []byte(Response), } |