IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-25712] Fix silent errors on post import failures (#14729)

Browse Source 
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Miguel de la Cruz
2020-06-03 16:40:24 +02:00
committed by GitHub
parent 7bba8db65f
commit 2ba119d7f6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/import.go
View File

@@ -40,7 +40,9 @@ func (a *App) bulkImportWorker(dryRun bool, wg *sync.WaitGroup, lines <-chan Lin
errors <- LineImportWorkerError{model.NewAppError("BulkImport", "app.import.import_line.null_post.error", nil, "", http.StatusBadRequest), line.LineNumber}
}
if len(posts) >= importMultiplePostsThreshold {
a.importMultiplePosts(posts, dryRun)
if err := a.importMultiplePosts(posts, dryRun); err != nil {
errors <- LineImportWorkerError{err, line.LineNumber}
}
posts = []*PostImportData{}
}
case line.LineImportData.Type == "direct_post":
@@ -49,7 +51,9 @@ func (a *App) bulkImportWorker(dryRun bool, wg *sync.WaitGroup, lines <-chan Lin
errors <- LineImportWorkerError{model.NewAppError("BulkImport", "app.import.import_line.null_direct_post.error", nil, "", http.StatusBadRequest), line.LineNumber}
}
if len(directPosts) >= importMultiplePostsThreshold {
a.importMultipleDirectPosts(directPosts, dryRun)
if err := a.importMultipleDirectPosts(directPosts, dryRun); err != nil {
errors <- LineImportWorkerError{err, line.LineNumber}
}
directPosts = []*DirectPostImportData{}
}
default:
@@ -60,10 +64,14 @@ func (a *App) bulkImportWorker(dryRun bool, wg *sync.WaitGroup, lines <-chan Lin
}
if len(posts) > 0 {
a.importMultiplePosts(posts, dryRun)
if err := a.importMultiplePosts(posts, dryRun); err != nil {
errors <- LineImportWorkerError{err, 0}
}
}
if len(directPosts) > 0 {
a.importMultipleDirectPosts(directPosts, dryRun)
if err := a.importMultipleDirectPosts(directPosts, dryRun); err != nil {
errors <- LineImportWorkerError{err, 0}
}
}
wg.Done()
}