diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-19 12:19:02 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-19 12:19:02 -0400 |
commit | 5f439458059c94054c2e41b7bf21234008830709 (patch) | |
tree | 00a46bcf2112cf38f70deeb1acae6c6424f472cc /api/user.go | |
parent | ca6bff340d2319ee86828de3591f010a66ffa8f9 (diff) | |
parent | 9222e191aab9397b6a7c6713d1b0b0b96b421de7 (diff) | |
download | chat-5f439458059c94054c2e41b7bf21234008830709.tar.gz chat-5f439458059c94054c2e41b7bf21234008830709.tar.bz2 chat-5f439458059c94054c2e41b7bf21234008830709.zip |
Merge pull request #394 from mattermost/mm-1410
MM-1410 Initial implementaiton of import from Slack
Diffstat (limited to 'api/user.go')
-rw-r--r-- | api/user.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index 2e71ddfc6..05ccd03e8 100644 --- a/api/user.go +++ b/api/user.go @@ -181,12 +181,13 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { if result := <-Srv.Store.User().Save(user); result.Err != nil { c.Err = result.Err + l4g.Error("Filae err=%v", result.Err) return nil } else { ruser := result.Data.(*model.User) // Soft error if there is an issue joining the default channels - if err := JoinDefaultChannels(c, ruser, channelRole); err != nil { + if err := JoinDefaultChannels(ruser, channelRole); err != nil { l4g.Error("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", ruser.Id, ruser.TeamId, err) } |