From 55da8e437d9d6ae0b04169cb3363808c1ddd0e15 Mon Sep 17 00:00:00 2001 From: "duanyi.aster" Date: Wed, 2 Aug 2023 13:33:24 +0800 Subject: [PATCH] chore: rename --- client/client.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- server/server_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/client.go b/client/client.go index 3fe0643a0f..adfcce83e2 100644 --- a/client/client.go +++ b/client/client.go @@ -319,8 +319,8 @@ func applyCallOptions(ctx context.Context, cfg rpcinfo.MutableRPCConfig, svr rem // Call implements the Client interface . func (kc *kClient) Call(ctx context.Context, method string, request, response interface{}) (err error) { - // use backup context if no metainfo found - ctx = backup.RecoverCtxOndemands(ctx, kc.opt.CtxBackupHandler) + // merge backup context if no metainfo found in ctx + ctx = backup.RecoverCtxOnDemands(ctx, kc.opt.CtxBackupHandler) validateForCall(ctx, kc.inited, kc.closed) var ri rpcinfo.RPCInfo diff --git a/go.mod b/go.mod index 286ec1f961..702ba3ff24 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cloudwego/dynamicgo v0.1.2 github.com/cloudwego/fastpb v0.0.4 github.com/cloudwego/frugal v0.1.7 - github.com/cloudwego/localsession v0.0.2-beta.0.20230802050711-24c02255f338 + github.com/cloudwego/localsession v0.0.2-beta.0.20230802053006-16e41b3db4c9 github.com/cloudwego/netpoll v0.4.1 github.com/cloudwego/thriftgo v0.2.11 github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 49f1c00953..a4ec552fc5 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/cloudwego/frugal v0.1.7/go.mod h1:3VECBCSiTYwm3QApqHXjZB9NDH+8hUw7txx github.com/cloudwego/kitex v0.3.2/go.mod h1:/XD07VpUD9VQWmmoepASgZ6iw//vgWikVA9MpzLC5i0= github.com/cloudwego/kitex v0.4.4/go.mod h1:3FcH5h9Qw+dhRljSzuGSpWuThttA8DvK0BsL7HUYydo= github.com/cloudwego/kitex v0.6.1/go.mod h1:zI1GBrjT0qloTikcCfQTgxg3Ws+yQMyaChEEOcGNUvA= -github.com/cloudwego/localsession v0.0.2-beta.0.20230802050711-24c02255f338 h1:tDF+SaPpV4JsXNhwbv+CxwnuMgwFtoW4cyHUM6B+YP0= -github.com/cloudwego/localsession v0.0.2-beta.0.20230802050711-24c02255f338/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8= +github.com/cloudwego/localsession v0.0.2-beta.0.20230802053006-16e41b3db4c9 h1:5SZMdX9wVK4Gjhj1G4spHRnzTZKUOLFp5KWjkF4QE2c= +github.com/cloudwego/localsession v0.0.2-beta.0.20230802053006-16e41b3db4c9/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8= github.com/cloudwego/netpoll v0.2.4/go.mod h1:1T2WVuQ+MQw6h6DpE45MohSvDTKdy2DlzCx2KsnPI4E= github.com/cloudwego/netpoll v0.3.1/go.mod h1:1T2WVuQ+MQw6h6DpE45MohSvDTKdy2DlzCx2KsnPI4E= github.com/cloudwego/netpoll v0.4.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= diff --git a/server/server_test.go b/server/server_test.go index fd2d9556df..c3af42c750 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -652,7 +652,7 @@ func testInvokeHandlerWithSession(t *testing.T, fail bool, ad string) { defer wg.Done() // miss context here - ctx := backup.RecoverCtxOndemands(context.Background(), backupHandler) + ctx := backup.RecoverCtxOnDemands(context.Background(), backupHandler) if !fail { b, _ := metainfo.GetPersistentValue(ctx, "a")