github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

refine log message

pull/432/head
Darien Raymond 2017-02-21 22:15:20 +01:00
parent 3112d3a2d3
commit 0f71305ee1
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/http/server.go
View File

@ -119,8 +119,7 @@ func (s *Server) handleConnect(ctx context.Context, request *http.Request, reade
Close: false, Close: false,
} }
if err := response.Write(writer); err != nil { if err := response.Write(writer); err != nil {
log.Warning("HTTP|Server: failed to write back OK response: ", err) return errors.Base(err).Message("HTTP|Server: Failed to write back OK response.")
return err
} }
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
@ -153,10 +152,9 @@ func (s *Server) handleConnect(ctx context.Context, request *http.Request, reade
}) })
if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil { if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil {
log.Info("HTTP|Server: Connection ends with: ", err)
ray.InboundInput().CloseError() ray.InboundInput().CloseError()
ray.InboundOutput().CloseError() ray.InboundOutput().CloseError()
return err return errors.Base(err).Message("HTTP|Server: Connection ends.")
} }
runtime.KeepAlive(timer) runtime.KeepAlive(timer)
@ -253,10 +251,9 @@ func (s *Server) handlePlainHTTP(ctx context.Context, request *http.Request, rea
}) })
if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil { if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil {
log.Info("HTTP|Server: Connecton ending with ", err)
input.CloseError() input.CloseError()
output.CloseError() output.CloseError()
return err return errors.Base(err).Message("HTTP|Server: Connection ends.")
} }
return nil return nil