From 99ea780f2048f0f53f1c0ae86edb53749ab770c2 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 15 May 2019 16:04:43 -0400 Subject: [PATCH] MM-13142 Replace mlog.Any with mlog.Err (#10848) --- app/opengraph.go | 10 +++++----- app/post_metadata.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/opengraph.go b/app/opengraph.go index ce747f9424..a5a1dab5e2 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.Any("err", err)) + mlog.Error("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.Any("err", err)) + mlog.Error("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.Any("err", err)) + mlog.Error("forceHTMLEncodingToUTF8 failed to convert", mlog.String("contentType", contentType), mlog.Err(err)) return body } return r @@ -63,7 +63,7 @@ func forceHTMLEncodingToUTF8(body io.Reader, contentType string) io.Reader { func makeOpenGraphURLsAbsolute(og *opengraph.OpenGraph, requestURL string) { parsedRequestURL, err := url.Parse(requestURL) if err != nil { - mlog.Warn("makeOpenGraphURLsAbsolute failed to parse url", mlog.String("requestURL", requestURL), mlog.Any("err", err)) + mlog.Warn("makeOpenGraphURLsAbsolute failed to parse url", mlog.String("requestURL", requestURL), mlog.Err(err)) return } @@ -74,7 +74,7 @@ func makeOpenGraphURLsAbsolute(og *opengraph.OpenGraph, requestURL string) { parsedResultURL, err := url.Parse(resultURL) if err != nil { - mlog.Warn("makeOpenGraphURLsAbsolute failed to parse result", mlog.String("requestURL", requestURL), mlog.Any("err", err)) + mlog.Warn("makeOpenGraphURLsAbsolute failed to parse result", mlog.String("requestURL", requestURL), mlog.Err(err)) return resultURL } diff --git a/app/post_metadata.go b/app/post_metadata.go index 0a86601b3e..bddd310bc9 100644 --- a/app/post_metadata.go +++ b/app/post_metadata.go @@ -67,7 +67,7 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *mo // Emojis and reaction counts if emojis, reactions, err := a.getEmojisAndReactionsForPost(post); err != nil { - mlog.Warn("Failed to get emojis and reactions for a post", mlog.String("post_id", post.Id), mlog.Any("err", err)) + mlog.Warn("Failed to get emojis and reactions for a post", mlog.String("post_id", post.Id), mlog.Err(err)) } else { post.Metadata.Emojis = emojis post.Metadata.Reactions = reactions @@ -75,7 +75,7 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *mo // Files if fileInfos, err := a.getFileMetadataForPost(post); err != nil { - mlog.Warn("Failed to get files for a post", mlog.String("post_id", post.Id), mlog.Any("err", err)) + mlog.Warn("Failed to get files for a post", mlog.String("post_id", post.Id), mlog.Err(err)) } else { post.Metadata.Files = fileInfos } @@ -84,7 +84,7 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *mo firstLink, images := getFirstLinkAndImages(post.Message) if embed, err := a.getEmbedForPost(post, firstLink, isNewPost); err != nil { - mlog.Debug("Failed to get embedded content for a post", mlog.String("post_id", post.Id), mlog.Any("err", err)) + mlog.Debug("Failed to get embedded content for a post", mlog.String("post_id", post.Id), mlog.Err(err)) } else if embed == nil { post.Metadata.Embeds = []*model.PostEmbed{} } else { @@ -195,7 +195,7 @@ func (a *App) getImagesForPost(post *model.Post, imageURLs []string, isNewPost b for _, imageURL := range imageURLs { if _, image, err := a.getLinkMetadata(imageURL, post.CreateAt, isNewPost); err != nil { mlog.Debug("Failed to get dimensions of an image in a post", - mlog.String("post_id", post.Id), mlog.String("image_url", imageURL), mlog.Any("err", err)) + mlog.String("post_id", post.Id), mlog.String("image_url", imageURL), mlog.Err(err)) } else if image != nil { images[imageURL] = image }