summaryrefslogtreecommitdiffstats
path: root/api4/file.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-12-22 06:09:33 -0600
committerGeorge Goldberg <george@gberg.me>2017-12-22 12:09:33 +0000
commit91bfc72a99477b6d611b13e225786e3ca7add10c (patch)
treec95b30741fb6ed8e57a356651c1c0fe88d30783a /api4/file.go
parent5189e8ea105712a9d561d0dade80932cc2c0ccf9 (diff)
downloadchat-91bfc72a99477b6d611b13e225786e3ca7add10c.tar.gz
chat-91bfc72a99477b6d611b13e225786e3ca7add10c.tar.bz2
chat-91bfc72a99477b6d611b13e225786e3ca7add10c.zip
Reduce logging data races, fix MySQL test race condition (#7994)
* fix races * revert unintentional change * fix test as intended
Diffstat (limited to 'api4/file.go')
-rw-r--r--api4/file.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/api4/file.go b/api4/file.go
index 7e13d0290..48ee281fe 100644
--- a/api4/file.go
+++ b/api4/file.go
@@ -9,7 +9,6 @@ import (
"strconv"
"strings"
- l4g "github.com/alecthomas/log4go"
"github.com/mattermost/mattermost-server/app"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
@@ -44,8 +43,6 @@ var MEDIA_CONTENT_TYPES = [...]string{
}
func (api *API) InitFile() {
- l4g.Debug(utils.T("api.file.init.debug"))
-
api.BaseRoutes.Files.Handle("", api.ApiSessionRequired(uploadFile)).Methods("POST")
api.BaseRoutes.File.Handle("", api.ApiSessionRequiredTrustRequester(getFile)).Methods("GET")
api.BaseRoutes.File.Handle("/thumbnail", api.ApiSessionRequiredTrustRequester(getFileThumbnail)).Methods("GET")