Increment request id and initialize request time before request reading, so log messages contain correct id and duration for request read errors

This commit is contained in:
Aliaksandr Valialkin
2015-11-06 16:34:16 +02:00
parent 5a6e973ab3
commit 03f8f2408e
+8 -5
View File
@@ -470,8 +470,11 @@ func (s *Server) serveConn(c io.ReadWriteCloser) error {
var err error
for {
ctx.ID++
ctx.Time = time.Now()
if rd != nil {
if err = rd.SetReadDeadline(time.Now().Add(readTimeout)); err != nil {
if err = rd.SetReadDeadline(ctx.Time.Add(readTimeout)); err != nil {
break
}
if dt < time.Second || br != nil {
@@ -529,11 +532,11 @@ func (s *Server) serveConn(c io.ReadWriteCloser) error {
break
}
dt = time.Since(prevReadTime)
prevReadTime = time.Now()
currentTime := time.Now()
dt = currentTime.Sub(prevReadTime)
prevReadTime = currentTime
ctx.ID++
ctx.Time = time.Now()
ctx.Time = currentTime
ctx.Response.Clear()
s.Handler(ctx)
shadow := ctx.shadow