diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /app/authorization.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/authorization.go')
-rw-r--r-- | app/authorization.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/authorization.go b/app/authorization.go index 6bce9e6e7..57a38c199 100644 --- a/app/authorization.go +++ b/app/authorization.go @@ -4,10 +4,11 @@ package app import ( + "fmt" "net/http" "strings" - l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -193,8 +194,8 @@ func (a *App) RolesGrantPermission(roleNames []string, permissionId string) bool if err != nil { // This should only happen if something is very broken. We can't realistically // recover the situation, so deny permission and log an error. - l4g.Error("Failed to get roles from database with role names: " + strings.Join(roleNames, ",")) - l4g.Error(err) + mlog.Error("Failed to get roles from database with role names: " + strings.Join(roleNames, ",")) + mlog.Error(fmt.Sprint(err)) return false } |