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/resetter | |
| 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/resetter')
| -rw-r--r-- | plugins/resetter/tests/resetter_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/resetter/tests/resetter_test.go b/plugins/resetter/tests/resetter_test.go index 45de67e3..95c3a6b4 100644 --- a/plugins/resetter/tests/resetter_test.go +++ b/plugins/resetter/tests/resetter_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/spiral/endure" - "github.com/spiral/goridge/v3" + goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc" "github.com/spiral/roadrunner/v2/plugins/config" "github.com/spiral/roadrunner/v2/plugins/logger" "github.com/spiral/roadrunner/v2/plugins/resetter" @@ -83,7 +83,7 @@ func TestResetterInit(t *testing.T) { func resetterRPCTest(t *testing.T) { conn, err := net.Dial("tcp", "127.0.0.1:6001") assert.NoError(t, err) - client := rpc.NewClientWithCodec(goridge.NewClientCodec(conn)) + client := rpc.NewClientWithCodec(goridgeRpc.NewClientCodec(conn)) // WorkerList contains list of workers. var ret bool |