summaryrefslogtreecommitdiffstats
path: root/app/auto_users.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/auto_users.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/auto_users.go')
-rw-r--r--app/auto_users.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/auto_users.go b/app/auto_users.go
index 8ed6767ad..b11f9c572 100644
--- a/app/auto_users.go
+++ b/app/auto_users.go
@@ -4,11 +4,10 @@
package app
import (
+ "github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
"github.com/mattermost/mattermost-server/utils"
-
- l4g "github.com/alecthomas/log4go"
)
type AutoUserCreator struct {
@@ -75,7 +74,7 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
result, err := cfg.client.CreateUserWithInvite(user, "", "", cfg.team.InviteId)
if err != nil {
- l4g.Error(err.Error())
+ mlog.Error(err.Error())
return nil, false
}
@@ -83,7 +82,7 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
status := &model.Status{UserId: ruser.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
if result := <-cfg.app.Srv.Store.Status().SaveOrUpdate(status); result.Err != nil {
- l4g.Error(result.Err.Error())
+ mlog.Error(result.Err.Error())
return nil, false
}