Skip to content

Commit 3ec1b6c

Browse files
Gusted6543
Gusted
andauthored
Fix logging of Transfer API (#19456)
- Use the correct fullname's in tracing calls. - Return correct function name in error. Co-authored-by: 6543 <[email protected]>
1 parent c764355 commit 3ec1b6c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

routers/api/v1/repo/transfer.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,16 @@ func Transfer(ctx *context.APIContext) {
104104
ctx.Repo.GitRepo = nil
105105
}
106106

107+
oldFullname := ctx.Repo.Repository.FullName()
108+
107109
if err := repo_service.StartRepositoryTransfer(ctx.Doer, newOwner, ctx.Repo.Repository, teams); err != nil {
108110
if models.IsErrRepoTransferInProgress(err) {
109-
ctx.Error(http.StatusConflict, "CreatePendingRepositoryTransfer", err)
111+
ctx.Error(http.StatusConflict, "StartRepositoryTransfer", err)
110112
return
111113
}
112114

113115
if repo_model.IsErrRepoAlreadyExist(err) {
114-
ctx.Error(http.StatusUnprocessableEntity, "CreatePendingRepositoryTransfer", err)
116+
ctx.Error(http.StatusUnprocessableEntity, "StartRepositoryTransfer", err)
115117
return
116118
}
117119

@@ -120,12 +122,12 @@ func Transfer(ctx *context.APIContext) {
120122
}
121123

122124
if ctx.Repo.Repository.Status == repo_model.RepositoryPendingTransfer {
123-
log.Trace("Repository transfer initiated: %s -> %s", ctx.Repo.Repository.FullName(), newOwner.Name)
125+
log.Trace("Repository transfer initiated: %s -> %s", oldFullname, ctx.Repo.Repository.FullName())
124126
ctx.JSON(http.StatusCreated, convert.ToRepo(ctx.Repo.Repository, perm.AccessModeAdmin))
125127
return
126128
}
127129

128-
log.Trace("Repository transferred: %s -> %s", ctx.Repo.Repository.FullName(), newOwner.Name)
130+
log.Trace("Repository transferred: %s -> %s", oldFullname, ctx.Repo.Repository.FullName())
129131
ctx.JSON(http.StatusAccepted, convert.ToRepo(ctx.Repo.Repository, perm.AccessModeAdmin))
130132
}
131133

0 commit comments

Comments
 (0)