correct transaction ending (#17151)

axifive · web-flow · commit 9cf5739c0fa8 · 2021-09-25T16:45:39.000+01:00
Signed-off-by: Alexey Terentyev &lt;axifnx@gmail.com&gt;
diff --git a/services/archiver/archiver.go b/services/archiver/archiver.go
@@ -132,9 +132,11 @@ func doArchive(r *ArchiveRequest) (*models.RepoArchiver, error) {
 	if err == nil {
 		if archiver.Status == models.RepoArchiverGenerating {
 			archiver.Status = models.RepoArchiverReady
-			return archiver, models.UpdateRepoArchiverStatus(ctx, archiver)
+			if err = models.UpdateRepoArchiverStatus(ctx, archiver); err != nil {
+				return nil, err
+			}
 		}
-		return archiver, nil
+		return archiver, commiter.Commit()
 	}
 
 	if !errors.Is(err, os.ErrNotExist) {

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,11 @@ func doArchive(r ArchiveRequest) (models.RepoArchiver, error) {`
`132`	`132`	`if err == nil {`
`133`	`133`	`if archiver.Status == models.RepoArchiverGenerating {`
`134`	`134`	`archiver.Status = models.RepoArchiverReady`
`135`		`- return archiver, models.UpdateRepoArchiverStatus(ctx, archiver)`
	`135`	`+ if err = models.UpdateRepoArchiverStatus(ctx, archiver); err != nil {`
	`136`	`+ return nil, err`
	`137`	`+ }`
`136`	`138`	`}`
`137`		`- return archiver, nil`
	`139`	`+ return archiver, commiter.Commit()`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`if !errors.Is(err, os.ErrNotExist) {`