kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

API: explicitely ignore unhandled errors

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-05 17:51:22 +02:00
parent 744f1c261c
commit 0507c358d9
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/server/httputils/httputils.go
View file

@ -31,7 +31,7 @@ func HijackConnection(w http.ResponseWriter) (io.ReadCloser, io.Writer, error) {
return nil, nil, err return nil, nil, err
} }
// Flush the options to make sure the client sets the raw mode // Flush the options to make sure the client sets the raw mode
conn.Write([]byte{}) _, _ = conn.Write([]byte{})
return conn, conn, nil return conn, conn, nil
} }
@ -41,9 +41,9 @@ func CloseStreams(streams ...interface{}) {
if tcpc, ok := stream.(interface { if tcpc, ok := stream.(interface {
CloseWrite() error CloseWrite() error
}); ok { }); ok {
tcpc.CloseWrite() _ = tcpc.CloseWrite()
} else if closer, ok := stream.(io.Closer); ok { } else if closer, ok := stream.(io.Closer); ok {
closer.Close() _ = closer.Close()
} }
} }
} }
@ -102,7 +102,7 @@ func MakeErrorHandler(err error) http.HandlerFunc {
response := &types.ErrorResponse{ response := &types.ErrorResponse{
Message: err.Error(), Message: err.Error(),
} }
WriteJSON(w, statusCode, response) _ = WriteJSON(w, statusCode, response)
} else { } else {
http.Error(w, status.Convert(err).Message(), statusCode) http.Error(w, status.Convert(err).Message(), statusCode)
} }

4
api/server/httputils/write_log_stream.go
View file

@ -51,10 +51,10 @@ func WriteLogStream(_ context.Context, w io.Writer, msgs <-chan *backend.LogMess
logLine = append([]byte(msg.Timestamp.Format(jsonmessage.RFC3339NanoFixed)+" "), logLine...) logLine = append([]byte(msg.Timestamp.Format(jsonmessage.RFC3339NanoFixed)+" "), logLine...)
} }
if msg.Source == "stdout" && config.ShowStdout { if msg.Source == "stdout" && config.ShowStdout {
outStream.Write(logLine) _, _ = outStream.Write(logLine)
} }
if msg.Source == "stderr" && config.ShowStderr { if msg.Source == "stderr" && config.ShowStderr {
errStream.Write(logLine) _, _ = errStream.Write(logLine)
} }
} }
} }