Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Chandler <wchandler@gitlab.com>2022-07-28 21:50:08 +0300
committerWill Chandler <wchandler@gitlab.com>2022-08-31 22:56:17 +0300
commit927a008d4a5e08a6b1a70a42711d84af9b118057 (patch)
treefa9f4a9f6d4f999bc2ecb3d6aa0436bc8348df4f
parented83328c18b4bc5e0c7d81211191b8cd9326ea69 (diff)
praefect: Make track-repository output consistent
Currently most output from the `track-repository` subcommand is made via the commands writer, but a subset is done via logger. This leads to an inconsistent format where some output is plaintext, while other messages are in JSON, which is difficult to read. Let's make this consistent by making all non-debug output use the writer, which will be simpler to parse for a one-off CLI command.
-rw-r--r--cmd/praefect/subcmd_track_repository.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/praefect/subcmd_track_repository.go b/cmd/praefect/subcmd_track_repository.go
index 7db144515..fb377ad18 100644
--- a/cmd/praefect/subcmd_track_repository.go
+++ b/cmd/praefect/subcmd_track_repository.go
@@ -233,7 +233,7 @@ func (cmd *trackRepository) trackRepository(
repositoryID, err := ds.ReserveRepositoryID(ctx, cmd.virtualStorage, cmd.relativePath)
if err != nil {
if errors.Is(err, commonerr.ErrRepositoryAlreadyExists) {
- cmd.logger.Print("repository is already tracked in praefect database")
+ fmt.Fprintf(cmd.w, "repository is already tracked in praefect database")
return 0, nil
}
@@ -290,8 +290,7 @@ func (cmd *trackRepository) authoritativeRepositoryExists(ctx context.Context, c
}
exists, err := repositoryExists(ctx, repo, node.Address, node.Token)
if err != nil {
- logger.WithError(err).Warnf("checking if repository exists %q, %q", node.Storage, cmd.relativePath)
- return false, nil
+ return false, fmt.Errorf("checking if repository exists %q, %q", node.Storage, cmd.relativePath)
}
return exists, nil
}