diff options
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/app/user.go b/app/user.go index 27f1c5d85..b98583f80 100644 --- a/app/user.go +++ b/app/user.go @@ -202,7 +202,9 @@ func (a *App) CreateUser(user *model.User) (*model.User, *model.AppError) { // This message goes to everyone, so the teamId, channelId and userId are irrelevant message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_NEW_USER, "", "", "", nil) message.Add("user_id", ruser.Id) - go a.Publish(message) + a.Go(func() { + a.Publish(message) + }) return ruser, nil } @@ -980,7 +982,9 @@ func (a *App) sendUpdatedUserEvent(user model.User, asAdmin bool) { omitUsers[user.Id] = true message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_UPDATED, "", "", "", omitUsers) message.Add("user", user) - go a.Publish(message) + a.Go(func() { + a.Publish(message) + }) } func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User, *model.AppError) { @@ -991,11 +995,11 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User, if sendNotifications { if rusers[0].Email != rusers[1].Email { - go func() { + a.Go(func() { if err := SendEmailChangeEmail(rusers[1].Email, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } - }() + }) if utils.Cfg.EmailSettings.RequireEmailVerification { if err := a.SendEmailVerification(rusers[0]); err != nil { @@ -1005,11 +1009,11 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User, } if rusers[0].Username != rusers[1].Username { - go func() { + a.Go(func() { if err := SendChangeUsernameEmail(rusers[1].Username, rusers[0].Username, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } - }() + }) } } @@ -1047,7 +1051,7 @@ func (a *App) UpdateMfa(activate bool, userId, token string) *model.AppError { } } - go func() { + a.Go(func() { var user *model.User var err *model.AppError @@ -1059,7 +1063,7 @@ func (a *App) UpdateMfa(activate bool, userId, token string) *model.AppError { if err := SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } - }() + }) return nil } @@ -1093,11 +1097,11 @@ func (a *App) UpdatePasswordSendEmail(user *model.User, newPassword, method stri return err } - go func() { + a.Go(func() { if err := SendPasswordChangeEmail(user.Email, method, user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } - }() + }) return nil } |