From 072de7d8cdd323f4a6592a113b9d5478e38dbe2c Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:06:57 +0800 Subject: [PATCH] Unify repo names in system notices (#36491) Fixes: https://github.com/go-gitea/gitea/issues/36211 This PR fixes ensures that all system notices consistently include repository names in the format `"Action description (owner/repo): error message"`. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: silverwind <115237+silverwind@users.noreply.github.com> Co-authored-by: silverwind --- routers/api/v1/repo/migrate.go | 1 + services/migrations/migrate.go | 4 ++-- services/mirror/mirror_pull.go | 8 ++++---- services/repository/adopt.go | 2 +- services/repository/check.go | 8 ++++---- services/repository/create.go | 12 ++++++------ services/repository/delete.go | 4 ++-- services/repository/fork.go | 4 ++-- services/repository/template.go | 4 ++-- services/wiki/wiki.go | 2 +- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 17259dc724..9355177fce 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -140,6 +140,7 @@ func Migrate(ctx *context.APIContext) { } opts := migrations.MigrateOptions{ + OriginalURL: form.CloneAddr, CloneAddr: remoteAddr, RepoName: form.RepoName, Description: form.Description, diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go index bf65e10454..99f8dba92f 100644 --- a/services/migrations/migrate.go +++ b/services/migrations/migrate.go @@ -131,8 +131,8 @@ func MigrateRepository(ctx context.Context, doer *user_model.User, ownerName str if err1 := uploader.Rollback(); err1 != nil { log.Error("rollback failed: %v", err1) } - if err2 := system_model.CreateRepositoryNotice(fmt.Sprintf("Migrate repository from %s failed: %v", opts.OriginalURL, err)); err2 != nil { - log.Error("create respotiry notice failed: ", err2) + if err2 := system_model.CreateRepositoryNotice(fmt.Sprintf("Migrate repository (%s/%s) from %s failed: %v", ownerName, opts.RepoName, opts.OriginalURL, err)); err2 != nil { + log.Error("create repository notice failed: ", err2) } return nil, err } diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 14a226f453..3a1ed2b7d9 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -202,7 +202,7 @@ func pruneBrokenReferences(ctx context.Context, m *repo_model.Mirror, gitRepo gi stdoutMessage := util.SanitizeCredentialURLs(stdout) log.Error("Failed to prune mirror repository %s references:\nStdout: %s\nStderr: %s\nErr: %v", gitRepo.RelativePath(), stdoutMessage, stderrMessage, pruneErr) - desc := fmt.Sprintf("Failed to prune mirror repository %s references: %s", gitRepo.RelativePath(), stderrMessage) + desc := fmt.Sprintf("Failed to prune mirror repository (%s) references: %s", m.Repo.FullName(), stderrMessage) if err := system_model.CreateRepositoryNotice(desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } @@ -277,7 +277,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo // If there is still an error (or there always was an error) if err != nil { log.Error("SyncMirrors [repo: %-v]: failed to update mirror repository:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdoutMessage, stderrMessage, err) - desc := fmt.Sprintf("Failed to update mirror repository '%s': %s", m.Repo.RelativePath(), stderrMessage) + desc := fmt.Sprintf("Failed to update mirror repository (%s): %s", m.Repo.FullName(), stderrMessage) if err := system_model.CreateRepositoryNotice(desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } @@ -355,7 +355,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo // If there is still an error (or there always was an error) if err != nil { log.Error("SyncMirrors [repo: %-v Wiki]: failed to update mirror repository wiki:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdoutMessage, stderrMessage, err) - desc := fmt.Sprintf("Failed to update mirror repository wiki '%s': %s", m.Repo.WikiStorageRepo().RelativePath(), stderrMessage) + desc := fmt.Sprintf("Failed to update mirror repository wiki (%s): %s", m.Repo.FullName(), stderrMessage) if err := system_model.CreateRepositoryNotice(desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } @@ -595,7 +595,7 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re // Update the is empty and default_branch columns if err := repo_model.UpdateRepositoryColsWithAutoTime(ctx, m.Repo, "default_branch", "is_empty"); err != nil { log.Error("Failed to update default branch of repository %-v. Error: %v", m.Repo, err) - desc := fmt.Sprintf("Failed to update default branch of repository '%s': %v", m.Repo.RelativePath(), err) + desc := fmt.Sprintf("Failed to update default branch of repository (%s): %v", m.Repo.FullName(), err) if err = system_model.CreateRepositoryNotice(desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 18d70d1bee..13218193d5 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -74,7 +74,7 @@ func AdoptRepository(ctx context.Context, doer, owner *user_model.User, opts Cre // WARNING: Don't override all later err with local variables defer func() { if err != nil { - // we can not use the ctx because it maybe canceled or timeout + // we can not use `ctx` because it may be canceled or timed out if errDel := deleteFailedAdoptRepository(repo.ID); errDel != nil { log.Error("Failed to delete repository %s that could not be adopted: %v", repo.FullName(), errDel) } diff --git a/services/repository/check.go b/services/repository/check.go index e521af94e1..4ae49d81f6 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -91,7 +91,7 @@ func GitGcRepo(ctx context.Context, repo *repo_model.Repository, timeout time.Du stdout, _, err = gitrepo.RunCmdString(ctx, repo, command) if err != nil { log.Error("Repository garbage collection failed for %-v. Stdout: %s\nError: %v", repo, stdout, err) - desc := fmt.Sprintf("Repository garbage collection failed for %s. Stdout: %s\nError: %v", repo.RelativePath(), stdout, err) + desc := fmt.Sprintf("Repository garbage collection failed (%s). Stdout: %s\nError: %v", repo.FullName(), stdout, err) if err := system_model.CreateRepositoryNotice(desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } @@ -101,7 +101,7 @@ func GitGcRepo(ctx context.Context, repo *repo_model.Repository, timeout time.Du // Now update the size of the repository if err := repo_module.UpdateRepoSize(ctx, repo); err != nil { log.Error("Updating size as part of garbage collection failed for %-v. Stdout: %s\nError: %v", repo, stdout, err) - desc := fmt.Sprintf("Updating size as part of garbage collection failed for %s. Stdout: %s\nError: %v", repo.RelativePath(), stdout, err) + desc := fmt.Sprintf("Updating size as part of garbage collection failed (%s). Stdout: %s\nError: %v", repo.FullName(), stdout, err) if err := system_model.CreateRepositoryNotice(desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } @@ -163,7 +163,7 @@ func DeleteMissingRepositories(ctx context.Context, doer *user_model.User) error log.Trace("Deleting %d/%d...", repo.OwnerID, repo.ID) if err := DeleteRepositoryDirectly(ctx, repo.ID); err != nil { log.Error("Failed to DeleteRepository %-v: Error: %v", repo, err) - if err2 := system_model.CreateRepositoryNotice("Failed to DeleteRepository %s [%d]: Error: %v", repo.FullName(), repo.ID, err); err2 != nil { + if err2 := system_model.CreateRepositoryNotice("Failed to DeleteRepository (%s) [%d]: Error: %v", repo.FullName(), repo.ID, err); err2 != nil { log.Error("CreateRepositoryNotice: %v", err) } } @@ -191,7 +191,7 @@ func ReinitMissingRepositories(ctx context.Context) error { log.Trace("Initializing %d/%d...", repo.OwnerID, repo.ID) if err := gitrepo.InitRepository(ctx, repo, repo.ObjectFormatName); err != nil { log.Error("Unable (re)initialize repository %d at %s. Error: %v", repo.ID, repo.RelativePath(), err) - if err2 := system_model.CreateRepositoryNotice("InitRepository [%d]: %v", repo.ID, err); err2 != nil { + if err2 := system_model.CreateRepositoryNotice("InitRepository (%s) [%d]: %v", repo.FullName(), repo.ID, err); err2 != nil { log.Error("CreateRepositoryNotice: %v", err2) } } diff --git a/services/repository/create.go b/services/repository/create.go index bfac83419d..cbdc9cca76 100644 --- a/services/repository/create.go +++ b/services/repository/create.go @@ -265,8 +265,8 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User, // WARNING: Don't override all later err with local variables defer func() { if err != nil { - // we can not use the ctx because it maybe canceled or timeout - cleanupRepository(repo.ID) + // we can not use `ctx` because it may be canceled or timed out + cleanupRepository(repo) } }() @@ -461,11 +461,11 @@ func createRepositoryInDB(ctx context.Context, doer, u *user_model.User, repo *r return nil } -func cleanupRepository(repoID int64) { - if errDelete := DeleteRepositoryDirectly(graceful.GetManager().ShutdownContext(), repoID); errDelete != nil { +func cleanupRepository(repo *repo_model.Repository) { + ctx := graceful.GetManager().ShutdownContext() + if errDelete := DeleteRepositoryDirectly(ctx, repo.ID); errDelete != nil { log.Error("cleanupRepository failed: %v", errDelete) - // add system notice - if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository: %v", errDelete); err != nil { + if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository (%s)", repo.FullName(), errDelete); err != nil { log.Error("CreateRepositoryNotice: %v", err) } } diff --git a/services/repository/delete.go b/services/repository/delete.go index 040280c8a8..aa16a968f7 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -309,7 +309,7 @@ func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams // Remove repository files. if err := gitrepo.DeleteRepository(ctx, repo); err != nil { - desc := fmt.Sprintf("Delete repository files [%s]: %v", repo.FullName(), err) + desc := fmt.Sprintf("Delete repository files (%s): %v", repo.FullName(), err) if err = system_model.CreateNotice(graceful.GetManager().ShutdownContext(), system_model.NoticeRepository, desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) } @@ -317,7 +317,7 @@ func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams // Remove wiki files if it exists. if err := gitrepo.DeleteRepository(ctx, repo.WikiStorageRepo()); err != nil { - desc := fmt.Sprintf("Delete wiki repository files [%s]: %v", repo.FullName(), err) + desc := fmt.Sprintf("Delete wiki repository files (%s): %v", repo.FullName(), err) // Note we use the db.DefaultContext here rather than passing in a context as the context may be cancelled if err = system_model.CreateNotice(graceful.GetManager().ShutdownContext(), system_model.NoticeRepository, desc); err != nil { log.Error("CreateRepositoryNotice: %v", err) diff --git a/services/repository/fork.go b/services/repository/fork.go index f92af65605..9c360c2f82 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -123,8 +123,8 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork // WARNING: Don't override all later err with local variables defer func() { if err != nil { - // we can not use the ctx because it maybe canceled or timeout - cleanupRepository(repo.ID) + // we can not use `ctx` because it may be canceled or timed out + cleanupRepository(repo) } }() diff --git a/services/repository/template.go b/services/repository/template.go index 7444bf7b60..96033cb98d 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -100,8 +100,8 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ // last - clean up the repository if something goes wrong defer func() { if err != nil { - // we can not use the ctx because it maybe canceled or timeout - cleanupRepository(generateRepo.ID) + // we can not use `ctx` because it may be canceled or timed out + cleanupRepository(generateRepo) } }() diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 1f1e564006..a025f26051 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -369,7 +369,7 @@ func DeleteWiki(ctx context.Context, repo *repo_model.Repository) error { } if err := gitrepo.DeleteRepository(ctx, repo.WikiStorageRepo()); err != nil { - desc := fmt.Sprintf("Delete wiki repository files [%s]: %v", repo.FullName(), err) + desc := fmt.Sprintf("Delete wiki repository files (%s): %v", repo.FullName(), err) // Note we use the db.DefaultContext here rather than passing in a context as the context may be cancelled if err = system_model.CreateNotice(graceful.GetManager().ShutdownContext(), system_model.NoticeRepository, desc); err != nil { log.Error("CreateRepositoryNotice: %v", err)