From 8c048a6604e15c95410a727265a9674d83837072 Mon Sep 17 00:00:00 2001 From: Gabe Jackson Date: Tue, 21 May 2019 13:57:26 -0400 Subject: [PATCH] Review error logging (#10897) This change lowers the levels of a few log messages in an attempt to bring them more in line with the severity of the actual message. --- app/channel.go | 2 +- app/opengraph.go | 6 +++--- app/web_conn.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/channel.go b/app/channel.go index b612f1ecc0..e38a7b5c3d 100644 --- a/app/channel.go +++ b/app/channel.go @@ -376,7 +376,7 @@ func (a *App) WaitForChannelMembership(channelId string, userId string) { return } - // If we received a error but it wasn't a missing channel member then return + // If we received an error, but it wasn't a missing channel member then return if err.Id != store.MISSING_CHANNEL_MEMBER_ERROR { return } diff --git a/app/opengraph.go b/app/opengraph.go index a5a1dab5e2..638ed11dbf 100644 --- a/app/opengraph.go +++ b/app/opengraph.go @@ -19,7 +19,7 @@ const MaxOpenGraphResponseSize = 1024 * 1024 * 50 func (a *App) GetOpenGraphMetadata(requestURL string) *opengraph.OpenGraph { res, err := a.HTTPService.MakeClient(false).Get(requestURL) if err != nil { - mlog.Error("GetOpenGraphMetadata request failed", mlog.String("requestURL", requestURL), mlog.Err(err)) + mlog.Warn("GetOpenGraphMetadata request failed", mlog.String("requestURL", requestURL), mlog.Err(err)) return nil } defer res.Body.Close() @@ -31,7 +31,7 @@ func (a *App) ParseOpenGraphMetadata(requestURL string, body io.Reader, contentT body = forceHTMLEncodingToUTF8(io.LimitReader(body, MaxOpenGraphResponseSize), contentType) if err := og.ProcessHTML(body); err != nil { - mlog.Error("ParseOpenGraphMetadata processing failed", mlog.String("requestURL", requestURL), mlog.Err(err)) + mlog.Warn("ParseOpenGraphMetadata processing failed", mlog.String("requestURL", requestURL), mlog.Err(err)) } makeOpenGraphURLsAbsolute(og, requestURL) @@ -54,7 +54,7 @@ func (a *App) ParseOpenGraphMetadata(requestURL string, body io.Reader, contentT func forceHTMLEncodingToUTF8(body io.Reader, contentType string) io.Reader { r, err := charset.NewReader(body, contentType) if err != nil { - mlog.Error("forceHTMLEncodingToUTF8 failed to convert", mlog.String("contentType", contentType), mlog.Err(err)) + mlog.Warn("forceHTMLEncodingToUTF8 failed to convert", mlog.String("contentType", contentType), mlog.Err(err)) return body } return r diff --git a/app/web_conn.go b/app/web_conn.go index 5a4715da60..59ca5322dd 100644 --- a/app/web_conn.go +++ b/app/web_conn.go @@ -200,9 +200,9 @@ func (c *WebConn) writePump() { if len(c.Send) >= SEND_DEADLOCK_WARN { if evtOk { - mlog.Error(fmt.Sprintf("websocket.full: message userId=%v type=%v channelId=%v size=%v", c.UserId, msg.EventType(), evt.Broadcast.ChannelId, len(msg.ToJson()))) + mlog.Warn(fmt.Sprintf("websocket.full: message userId=%v type=%v channelId=%v size=%v", c.UserId, msg.EventType(), evt.Broadcast.ChannelId, len(msg.ToJson()))) } else { - mlog.Error(fmt.Sprintf("websocket.full: message userId=%v type=%v size=%v", c.UserId, msg.EventType(), len(msg.ToJson()))) + mlog.Warn(fmt.Sprintf("websocket.full: message userId=%v type=%v size=%v", c.UserId, msg.EventType(), len(msg.ToJson()))) } }