Merge pull request #504 from TarsCloud/fix/server/timeout

perf: optimize server-side handling of timeout control
TarsCloud · Jan 9, 2024 · 359dd3f · 359dd3f
2 parents 98878d9 + a7f73e0
commit 359dd3f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tars/transport/tarsserver.go b/tars/transport/tarsserver.go
@@ -112,12 +112,12 @@ func (ts *TarsServer) invoke(ctx context.Context, pkg []byte) []byte {
 	if cfg.HandleTimeout == 0 {
 		rsp = ts.protocol.Invoke(ctx, pkg)
 	} else {
-		invokeDone, cancelFunc := context.WithTimeout(context.Background(), cfg.HandleTimeout)
+		invokeCtx, cancelFunc := context.WithTimeout(ctx, cfg.HandleTimeout)
 		go func() {
-			rsp = ts.protocol.Invoke(ctx, pkg)
+			rsp = ts.protocol.Invoke(invokeCtx, pkg)
 			cancelFunc()
 		}()
-		<-invokeDone.Done()
+		<-invokeCtx.Done()
 		if len(rsp) == 0 { // The rsp must be none-empty
 			rsp = ts.protocol.InvokeTimeout(pkg)
 		}