From 3ec1b6c2238c9eb46709091567eb2564aec86d99 Mon Sep 17 00:00:00 2001 From: Gusted Date: Thu, 21 Apr 2022 16:05:53 +0000 Subject: [PATCH] Fix logging of Transfer API (#19456) - Use the correct fullname's in tracing calls. - Return correct function name in error. Co-authored-by: 6543 <6543@obermui.de> --- routers/api/v1/repo/transfer.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go index 7578fbd187..241c578e60 100644 --- a/routers/api/v1/repo/transfer.go +++ b/routers/api/v1/repo/transfer.go @@ -104,14 +104,16 @@ func Transfer(ctx *context.APIContext) { ctx.Repo.GitRepo = nil } + oldFullname := ctx.Repo.Repository.FullName() + if err := repo_service.StartRepositoryTransfer(ctx.Doer, newOwner, ctx.Repo.Repository, teams); err != nil { if models.IsErrRepoTransferInProgress(err) { - ctx.Error(http.StatusConflict, "CreatePendingRepositoryTransfer", err) + ctx.Error(http.StatusConflict, "StartRepositoryTransfer", err) return } if repo_model.IsErrRepoAlreadyExist(err) { - ctx.Error(http.StatusUnprocessableEntity, "CreatePendingRepositoryTransfer", err) + ctx.Error(http.StatusUnprocessableEntity, "StartRepositoryTransfer", err) return } @@ -120,12 +122,12 @@ func Transfer(ctx *context.APIContext) { } if ctx.Repo.Repository.Status == repo_model.RepositoryPendingTransfer { - log.Trace("Repository transfer initiated: %s -> %s", ctx.Repo.Repository.FullName(), newOwner.Name) + log.Trace("Repository transfer initiated: %s -> %s", oldFullname, ctx.Repo.Repository.FullName()) ctx.JSON(http.StatusCreated, convert.ToRepo(ctx.Repo.Repository, perm.AccessModeAdmin)) return } - log.Trace("Repository transferred: %s -> %s", ctx.Repo.Repository.FullName(), newOwner.Name) + log.Trace("Repository transferred: %s -> %s", oldFullname, ctx.Repo.Repository.FullName()) ctx.JSON(http.StatusAccepted, convert.ToRepo(ctx.Repo.Repository, perm.AccessModeAdmin)) }