diff options
| author | zeripath <art27@cantab.net> | 2020-10-29 02:23:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 22:23:31 -0400 |
| commit | 4b33afcd5bf08afa116512eaea92c73ade332bee (patch) | |
| tree | 66010d7b7ebd4d38d6ad10d2fe481e42ad03d0e0 /modules | |
| parent | beb6bf4261ace56f9c97c03f709b4fe29746b3d7 (diff) | |
| download | gitea-4b33afcd5bf08afa116512eaea92c73ade332bee.tar.gz gitea-4b33afcd5bf08afa116512eaea92c73ade332bee.zip | |
Migration failure during reaction migration from gitea (#13344)
* Migrating reactions is just not that important
A failure during migrating reactions should not cause failure of
migration.
Signed-off-by: Andrew Thornton <art27@cantab.net>
* When checking issue reactions check the correct permission
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/migrations/gitea_downloader.go | 13 | ||||
| -rw-r--r-- | modules/migrations/migrate.go | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/modules/migrations/gitea_downloader.go b/modules/migrations/gitea_downloader.go index 1531153f2e..e30c92a2fc 100644 --- a/modules/migrations/gitea_downloader.go +++ b/modules/migrations/gitea_downloader.go @@ -14,6 +14,7 @@ import ( "strings" "time" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/migrations/base" "code.gitea.io/gitea/modules/structs" @@ -395,7 +396,11 @@ func (g *GiteaDownloader) GetIssues(page, perPage int) ([]*base.Issue, bool, err reactions, err := g.getIssueReactions(issue.Index) if err != nil { - return nil, false, fmt.Errorf("error while loading reactions for issue #%d. Error: %v", issue.Index, err) + log.Warn("Unable to load reactions during migrating issue #%d to %s/%s. Error: %v", issue.Index, g.repoOwner, g.repoName, err) + if err2 := models.CreateRepositoryNotice( + fmt.Sprintf("Unable to load reactions during migrating issue #%d to %s/%s. Error: %v", issue.Index, g.repoOwner, g.repoName, err)); err2 != nil { + log.Error("create repository notice failed: ", err2) + } } var assignees []string @@ -534,7 +539,11 @@ func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullReques reactions, err := g.getIssueReactions(pr.Index) if err != nil { - return nil, false, fmt.Errorf("error while loading reactions for pull #%d. Error: %v", pr.Index, err) + log.Warn("Unable to load reactions during migrating pull #%d to %s/%s. Error: %v", pr.Index, g.repoOwner, g.repoName, err) + if err2 := models.CreateRepositoryNotice( + fmt.Sprintf("Unable to load reactions during migrating pull #%d to %s/%s. Error: %v", pr.Index, g.repoOwner, g.repoName, err)); err2 != nil { + log.Error("create repository notice failed: ", err2) + } } var assignees []string diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go index 191f2a5550..3c505d82b6 100644 --- a/modules/migrations/migrate.go +++ b/modules/migrations/migrate.go @@ -69,7 +69,7 @@ func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, } if err2 := models.CreateRepositoryNotice(fmt.Sprintf("Migrate repository from %s failed: %v", opts.OriginalURL, err)); err2 != nil { - log.Error("create respotiry notice failed: ", err2) + log.Error("create repository notice failed: ", err2) } return nil, err } |