From c735c4f0fb7207f26ff9358ec89d11c5fc0007c2 Mon Sep 17 00:00:00 2001 From: Syd Xu Date: Fri, 2 Aug 2024 16:17:10 +0800 Subject: [PATCH] fix(server): support Pond v1.9.1 --- go.mod | 2 +- go.sum | 4 ++-- server/server.go | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 4f9a1cff..50da1467 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/apache/thrift v0.20.0 github.com/edwingeng/doublejump v1.0.1 github.com/fatih/color v1.17.0 - github.com/go-echarts/go-echarts/v2 v2.4.1 + github.com/go-echarts/go-echarts/v2 v2.3.3 github.com/go-ping/ping v1.1.0 github.com/go-redis/redis_rate/v10 v10.0.1 github.com/godzie44/go-uring v0.0.0-20220926161041-69611e8b13d5 diff --git a/go.sum b/go.sum index d48698c8..c67a41a4 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-echarts/go-echarts/v2 v2.4.1 h1:imBFGngJ9zv/2zJVjK3k0uLL+LzyPDgzeV7MWzxH0rs= -github.com/go-echarts/go-echarts/v2 v2.4.1/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI= +github.com/go-echarts/go-echarts/v2 v2.3.3 h1:uImZAk6qLkC6F9ju6mZ5SPBqTyK8xjZKwSmwnCg4bxg= +github.com/go-echarts/go-echarts/v2 v2.3.3/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= diff --git a/server/server.go b/server/server.go index bbccad3f..4b4fc5a4 100644 --- a/server/server.go +++ b/server/server.go @@ -72,7 +72,7 @@ type Handler func(ctx *Context) error type WorkerPool interface { Submit(task func()) StopAndWaitFor(deadline time.Duration) - Stop() + Stop() context.Context StopAndWait() } @@ -387,7 +387,6 @@ func (s *Server) sendResponse(ctx *share.Context, conn net.Conn, err error, req, protocol.PutData(data) }() } - } else { if s.writeTimeout != 0 { conn.SetWriteDeadline(time.Now().Add(s.writeTimeout))