diff --git a/server/channels/api4/post.go b/server/channels/api4/post.go index 64a0d4eb4f..8000bc79cf 100644 --- a/server/channels/api4/post.go +++ b/server/channels/api4/post.go @@ -144,7 +144,7 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) { if setOnline != "" { setOnlineBool, err2 = strconv.ParseBool(setOnline) if err2 != nil { - mlog.Warn("Failed to parse set_online URL query parameter from createPost request", mlog.Err(err2)) + c.Logger.Warn("Failed to parse set_online URL query parameter from createPost request", mlog.Err(err2)) setOnlineBool = true // Set online nevertheless. } } @@ -211,7 +211,7 @@ func createEphemeralPost(c *Context, w http.ResponseWriter, r *http.Request) { return } if err := rp.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -239,7 +239,7 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { if sinceString != "" { since, parseError = strconv.ParseInt(sinceString, 10, 64) if parseError != nil { - c.SetInvalidParam("since") + c.SetInvalidParamWithErr("since", parseError) return } } @@ -323,7 +323,7 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { } if err := clientPostList.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -389,7 +389,7 @@ func getPostsForChannelAroundLastUnread(c *Context, w http.ResponseWriter, r *ht w.Header().Set(model.HeaderEtagServer, etag) } if err := clientPostList.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -454,7 +454,7 @@ func getFlaggedPostsForUser(c *Context, w http.ResponseWriter, r *http.Request) return } if err := clientPostList.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -496,7 +496,7 @@ func getPost(c *Context, w http.ResponseWriter, r *http.Request) { w.Header().Set(model.HeaderEtagServer, post.Etag()) if err := post.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -640,7 +640,7 @@ func getPostThread(c *Context, w http.ResponseWriter, r *http.Request) { var err error perPage, err = strconv.Atoi(perPageStr) if err != nil || perPage > web.PerPageMaximum { - c.SetInvalidParam("perPage") + c.SetInvalidParamWithErr("perPage", err) return } } @@ -650,7 +650,7 @@ func getPostThread(c *Context, w http.ResponseWriter, r *http.Request) { var err error fromCreateAt, err = strconv.ParseInt(fromCreateAtStr, 10, 64) if err != nil { - c.SetInvalidParam("fromCreateAt") + c.SetInvalidParamWithErr("fromCreateAt", err) return } } @@ -721,7 +721,7 @@ func getPostThread(c *Context, w http.ResponseWriter, r *http.Request) { w.Header().Set(model.HeaderEtagServer, clientPostList.Etag()) if err := clientPostList.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -808,7 +808,7 @@ func searchPosts(c *Context, w http.ResponseWriter, r *http.Request, teamId stri w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") if err := results.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -881,7 +881,7 @@ func updatePost(c *Context, w http.ResponseWriter, r *http.Request) { auditRec.AddEventResultState(rpost) if err := rpost.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } } @@ -947,7 +947,7 @@ func patchPost(c *Context, w http.ResponseWriter, r *http.Request) { auditRec.AddEventResultState(patchedPost) if err := patchedPost.EncodeJSON(w); err != nil { - mlog.Warn("Error while writing response", mlog.Err(err)) + c.Logger.Warn("Error while writing response", mlog.Err(err)) } }