From 2ba119d7f6d6c9bec5ba3d8e3b48a453a7344956 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Wed, 3 Jun 2020 16:40:24 +0200 Subject: [PATCH] [MM-25712] Fix silent errors on post import failures (#14729) Co-authored-by: mattermod --- app/import.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/import.go b/app/import.go index 155d942bdd..c3e5cb3e25 100644 --- a/app/import.go +++ b/app/import.go @@ -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() }