diff options
| author | Chris <ccbrown112@gmail.com> | 2017-12-22 06:09:33 -0600 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-12-22 12:09:33 +0000 |
| commit | 91bfc72a99477b6d611b13e225786e3ca7add10c (patch) | |
| tree | c95b30741fb6ed8e57a356651c1c0fe88d30783a /wsapi | |
| parent | 5189e8ea105712a9d561d0dade80932cc2c0ccf9 (diff) | |
| download | chat-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 'wsapi')
| -rw-r--r-- | wsapi/status.go | 3 | ||||
| -rw-r--r-- | wsapi/system.go | 4 | ||||
| -rw-r--r-- | wsapi/user.go | 4 | ||||
| -rw-r--r-- | wsapi/webrtc.go | 4 |
4 files changed, 0 insertions, 15 deletions
diff --git a/wsapi/status.go b/wsapi/status.go index f0b212c73..c3d323053 100644 --- a/wsapi/status.go +++ b/wsapi/status.go @@ -7,12 +7,9 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitStatus() { - l4g.Debug(utils.T("wsapi.status.init.debug")) - api.Router.Handle("get_statuses", api.ApiWebSocketHandler(api.getStatuses)) api.Router.Handle("get_statuses_by_ids", api.ApiWebSocketHandler(api.getStatusesByIds)) } diff --git a/wsapi/system.go b/wsapi/system.go index 6959106d6..c3ee8e2a0 100644 --- a/wsapi/system.go +++ b/wsapi/system.go @@ -4,14 +4,10 @@ package wsapi import ( - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitSystem() { - l4g.Debug(utils.T("wsapi.system.init.debug")) - api.Router.Handle("ping", api.ApiWebSocketHandler(ping)) } diff --git a/wsapi/user.go b/wsapi/user.go index c8236c978..68fe27e0f 100644 --- a/wsapi/user.go +++ b/wsapi/user.go @@ -4,14 +4,10 @@ package wsapi import ( - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitUser() { - l4g.Debug(utils.T("wsapi.user.init.debug")) - api.Router.Handle("user_typing", api.ApiWebSocketHandler(api.userTyping)) } diff --git a/wsapi/webrtc.go b/wsapi/webrtc.go index 42e749ebb..fbefb1b38 100644 --- a/wsapi/webrtc.go +++ b/wsapi/webrtc.go @@ -4,14 +4,10 @@ package wsapi import ( - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitWebrtc() { - l4g.Debug(utils.T("wsapi.webtrc.init.debug")) - api.Router.Handle("webrtc", api.ApiWebSocketHandler(api.webrtcMessage)) } |