diff --git a/api4/channel_test.go b/api4/channel_test.go index 1e1ea4b2e1..16e432bf0d 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -1779,7 +1779,6 @@ func TestSearchGroupChannels(t *testing.T) { } func TestDeleteChannel(t *testing.T) { - t.Skip("MM-47465") th := Setup(t).InitBasic() defer th.TearDown() c := th.Client diff --git a/app/channel.go b/app/channel.go index 6bbe699fb0..f5c864ca38 100644 --- a/app/channel.go +++ b/app/channel.go @@ -1420,13 +1420,10 @@ func (a *App) DeleteChannel(c request.CTX, channel *model.Channel, userID string c.Logger().Warn("Failed to post archive message", mlog.Err(err)) } } else { - a.Srv().Go(func() { - systemBot, err := a.GetSystemBot() - if err != nil { - c.Logger().Error("Failed to post archive message", mlog.Err(err)) - return - } - + systemBot, err := a.GetSystemBot() + if err != nil { + c.Logger().Warn("Failed to post archive message", mlog.Err(err)) + } else { post := &model.Post{ ChannelId: channel.Id, Message: fmt.Sprintf(i18n.T("api.channel.delete_channel.archived"), systemBot.Username), @@ -1438,9 +1435,9 @@ func (a *App) DeleteChannel(c request.CTX, channel *model.Channel, userID string } if _, err := a.CreatePost(c, post, channel, false, true); err != nil { - c.Logger().Error("Failed to post archive message", mlog.Err(err)) + c.Logger().Warn("Failed to post archive message", mlog.Err(err)) } - }) + } } now := model.GetMillis()