summaryrefslogtreecommitdiffstats
path: root/app/command.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-04-27 14:12:01 -0700
committerChristopher Speller <crspeller@gmail.com>2018-04-27 14:12:01 -0700
commiteb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch)
treeed01fd9488bd86f6c2daf0b299dff5beb43973db /app/command.go
parent2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff)
parent2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff)
downloadchat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz
chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2
chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'app/command.go')
-rw-r--r--app/command.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/command.go b/app/command.go
index 039952cf0..796d656a7 100644
--- a/app/command.go
+++ b/app/command.go
@@ -10,7 +10,7 @@ import (
"net/url"
"strings"
- l4g "github.com/alecthomas/log4go"
+ "github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
goi18n "github.com/nicksnyder/go-i18n/i18n"
@@ -207,7 +207,7 @@ func (a *App) ExecuteCommand(args *model.CommandArgs) (*model.CommandResponse, *
teamCmds := result.Data.([]*model.Command)
for _, cmd := range teamCmds {
if trigger == cmd.Trigger {
- l4g.Debug(fmt.Sprintf(utils.T("api.command.execute_command.debug"), trigger, args.UserId))
+ mlog.Debug(fmt.Sprintf(utils.T("api.command.execute_command.debug"), trigger, args.UserId))
p := url.Values{}
p.Set("token", cmd.Token)
@@ -308,7 +308,7 @@ func (a *App) HandleCommandResponse(command *model.Command, args *model.CommandA
response.Attachments = a.ProcessSlackAttachments(response.Attachments)
if _, err := a.CreateCommandPost(post, args.TeamId, response); err != nil {
- l4g.Error(err.Error())
+ mlog.Error(err.Error())
}
return response, nil