unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

rewrite logger

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2020-11-04 00:38:12 +03:00
parent 7c311aea19
commit e41bb5ebc5
26 changed files with 235 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/handler/rpc/stream.go
View File

@@ -50,7 +50,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
payload, err := requestPayload(r)
if err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -73,7 +73,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
conn, rw, _, err := upgrader.Upgrade(r, w)
if err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -81,7 +81,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
defer func() {
if err := conn.Close(); err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -117,7 +117,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
stream, err := c.Stream(ctx, req, callOpt)
if err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -125,7 +125,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
if request != nil {
if err = stream.Send(request); err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -151,7 +151,7 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
return
}
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -159,13 +159,13 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
// write the response
if err := wsutil.WriteServerMessage(rw, op, buf); err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
if err = rw.Flush(); err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -196,7 +196,7 @@ func writeLoop(rw io.ReadWriter, stream client.Stream) {
}
}
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}
@@ -213,7 +213,7 @@ func writeLoop(rw io.ReadWriter, stream client.Stream) {
request := &raw.Frame{Data: buf}
if err := stream.Send(request); err != nil {
if logger.V(logger.ErrorLevel) {
logger.Error(err)
logger.Error(err.Error())
}
return
}