summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerrick Anderson <derrickanderson@derricks-mbp.lan>2018-02-23 15:34:04 -0500
committerDerrick Anderson <derrickanderson@derricks-mbp.lan>2018-02-23 15:34:04 -0500
commitbabccba8f88f58c50c345cc770550706df2f04c0 (patch)
tree49ba0d81051f907b27b8cd2ec8244d7bb3dd9b37
parent55261a2b155c4e3d699fc6bd4255f05fb8258157 (diff)
parent4538857ae36e5884ec8f70c4b29f9956d2b51114 (diff)
downloadchat-babccba8f88f58c50c345cc770550706df2f04c0.tar.gz
chat-babccba8f88f58c50c345cc770550706df2f04c0.tar.bz2
chat-babccba8f88f58c50c345cc770550706df2f04c0.zip
Merge branch 'merge47intomaster'
-rw-r--r--api4/context.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/api4/context.go b/api4/context.go
index 9f60ab01e..df249f8de 100644
--- a/api4/context.go
+++ b/api4/context.go
@@ -212,8 +212,10 @@ func (c *Context) LogAuditWithUserId(userId, extraInfo string) {
func (c *Context) LogError(err *model.AppError) {
- // filter out endless reconnects
- if c.Path == "/api/v3/users/websocket" && err.StatusCode == 401 || err.Id == "web.check_browser_compatibility.app_error" {
+ // Filter out 404s, endless reconnects and browser compatibility errors
+ if err.StatusCode == http.StatusNotFound ||
+ (c.Path == "/api/v3/users/websocket" && err.StatusCode == 401) ||
+ err.Id == "web.check_browser_compatibility.app_error" {
c.LogDebug(err)
} else {
l4g.Error(utils.TDefault("api.context.log.error"), c.Path, err.Where, err.StatusCode,