api/handler/rpc: not log error on client disconnect (#1482)
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
parent
7f8b35e295
commit
38aed6f0f6
@ -135,9 +135,19 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
|
|||||||
|
|
||||||
// receive from stream and send to client
|
// receive from stream and send to client
|
||||||
for {
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-stream.Context().Done():
|
||||||
|
return
|
||||||
|
default:
|
||||||
// read backend response body
|
// read backend response body
|
||||||
buf, err := rsp.Read()
|
buf, err := rsp.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
// wants to avoid import grpc/status.Status
|
||||||
|
if strings.Contains(err.Error(), "context canceled") {
|
||||||
|
return
|
||||||
|
}
|
||||||
if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
|
if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
}
|
}
|
||||||
@ -159,6 +169,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// writeLoop
|
// writeLoop
|
||||||
func writeLoop(rw io.ReadWriter, stream client.Stream) {
|
func writeLoop(rw io.ReadWriter, stream client.Stream) {
|
||||||
@ -166,13 +177,23 @@ func writeLoop(rw io.ReadWriter, stream client.Stream) {
|
|||||||
defer stream.Close()
|
defer stream.Close()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
select {
|
||||||
|
case <-stream.Context().Done():
|
||||||
|
return
|
||||||
|
default:
|
||||||
buf, op, err := wsutil.ReadClientData(rw)
|
buf, op, err := wsutil.ReadClientData(rw)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
wserr := err.(wsutil.ClosedError)
|
||||||
|
switch wserr.Code {
|
||||||
|
case ws.StatusNormalClosure, ws.StatusNoStatusRcvd:
|
||||||
|
return
|
||||||
|
default:
|
||||||
if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
|
if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
}
|
||||||
switch op {
|
switch op {
|
||||||
default:
|
default:
|
||||||
// not relevant
|
// not relevant
|
||||||
@ -184,7 +205,6 @@ func writeLoop(rw io.ReadWriter, stream client.Stream) {
|
|||||||
// default to trying json
|
// default to trying json
|
||||||
// if the extracted payload isn't empty lets use it
|
// if the extracted payload isn't empty lets use it
|
||||||
request := &raw.Frame{Data: buf}
|
request := &raw.Frame{Data: buf}
|
||||||
|
|
||||||
if err := stream.Send(request); err != nil {
|
if err := stream.Send(request); err != nil {
|
||||||
if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
|
if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
@ -193,6 +213,7 @@ func writeLoop(rw io.ReadWriter, stream client.Stream) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func isStream(r *http.Request, srv *api.Service) bool {
|
func isStream(r *http.Request, srv *api.Service) bool {
|
||||||
// check if it's a web socket
|
// check if it's a web socket
|
||||||
|
Loading…
Reference in New Issue
Block a user