diff --git a/server.go b/server.go index 280f783..a477c5f 100644 --- a/server.go +++ b/server.go @@ -205,8 +205,8 @@ type RequestCtx struct { id uint64 - serveConnRequestNum uint64 - serveConnTime time.Time + connRequestNum uint64 + connTime time.Time time time.Time lastReadDuration time.Duration @@ -281,16 +281,16 @@ func (ctx *RequestCtx) Time() time.Time { return ctx.time } -// ServeConnTime returns the time server starts serving the connection +// ConnTime returns the time server starts serving the connection // the current request came from. -func (ctx *RequestCtx) ServeConnTime() time.Time { - return ctx.serveConnTime +func (ctx *RequestCtx) ConnTime() time.Time { + return ctx.connTime } -// ServeConnRequestNum returns request sequence number +// ConnRequestNum returns request sequence number // for the current connection. -func (ctx *RequestCtx) ServeConnRequestNum() uint64 { - return ctx.serveConnRequestNum +func (ctx *RequestCtx) ConnRequestNum() uint64 { + return ctx.connRequestNum } // SetConnectionClose sets 'Connection: close' response header and closes @@ -688,8 +688,8 @@ func (s *Server) serveConn(c net.Conn) error { currentTime := time.Now() ctx := s.acquireCtx(c) - ctx.serveConnRequestNum = 0 - ctx.serveConnTime = currentTime + ctx.connRequestNum = 0 + ctx.connTime = currentTime var br *bufio.Reader var bw *bufio.Writer @@ -698,7 +698,7 @@ func (s *Server) serveConn(c net.Conn) error { var errMsg string for { ctx.id++ - ctx.serveConnRequestNum++ + ctx.connRequestNum++ ctx.time = currentTime if s.ReadTimeout > 0 { @@ -744,7 +744,7 @@ func (s *Server) serveConn(c net.Conn) error { ctx = s.acquireCtx(c) ctx.Error(errMsg, StatusRequestTimeout) } - if s.MaxRequestsPerConn > 0 && ctx.serveConnRequestNum >= uint64(s.MaxRequestsPerConn) { + if s.MaxRequestsPerConn > 0 && ctx.connRequestNum >= uint64(s.MaxRequestsPerConn) { ctx.SetConnectionClose() } @@ -919,9 +919,9 @@ func (ctx *RequestCtx) Init(req *Request, remoteAddr net.Addr, logger Logger) { ctx.initID() req.CopyTo(&ctx.Request) ctx.Response.Reset() - ctx.serveConnRequestNum = 0 - ctx.serveConnTime = time.Now() - ctx.time = ctx.serveConnTime + ctx.connRequestNum = 0 + ctx.connTime = time.Now() + ctx.time = ctx.connTime } var fakeServer Server diff --git a/server_test.go b/server_test.go index c6d7f2d..6599e84 100644 --- a/server_test.go +++ b/server_test.go @@ -215,14 +215,14 @@ func TestServerRequestNumAndTime(t *testing.T) { s := &Server{ Handler: func(ctx *RequestCtx) { n++ - if ctx.ServeConnRequestNum() != n { - t.Fatalf("unexpected request number: %d. Expecting %d", ctx.ServeConnRequestNum(), n) + if ctx.ConnRequestNum() != n { + t.Fatalf("unexpected request number: %d. Expecting %d", ctx.ConnRequestNum(), n) } if connT.IsZero() { - connT = ctx.ServeConnTime() + connT = ctx.ConnTime() } - if ctx.ServeConnTime() != connT { - t.Fatalf("unexpected serve conn time: %s. Expecting %s", ctx.ServeConnTime(), connT) + if ctx.ConnTime() != connT { + t.Fatalf("unexpected serve conn time: %s. Expecting %s", ctx.ConnTime(), connT) } }, }