tidy: logging

tinyzimmer · tinyzimmer · commit dbb93c039dcb · 2023-11-05T03:41:31.000+02:00
diff --git a/pkg/meshnode/bootstrap.go b/pkg/meshnode/bootstrap.go
@@ -50,11 +50,11 @@ func (s *meshStore) bootstrap(ctx context.Context, opts ConnectOptions) error {
 	opts.RequestVote = true
 	if bootstrapped {
 		// We have data, so the cluster is already bootstrapped.
-		s.log.Info("Cluster already bootstrapped, attempting to rejoin as voter")
 		if opts.JoinRoundTripper == nil {
 			s.log.Info("Cluster already bootstrapped, but we have no join transport. Recovering from storage.")
 			return s.recoverWireguard(ctx)
 		}
+		s.log.Info("Cluster already bootstrapped, attempting to rejoin as voter")
 		return s.join(ctx, opts)
 	}
 	s.log.Debug("Cluster not yet bootstrapped, attempting to bootstrap")

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ func (s *meshStore) bootstrap(ctx context.Context, opts ConnectOptions) error {`
`50`	`50`	`opts.RequestVote = true`
`51`	`51`	`if bootstrapped {`
`52`	`52`	`// We have data, so the cluster is already bootstrapped.`
`53`		`- s.log.Info("Cluster already bootstrapped, attempting to rejoin as voter")`
`54`	`53`	`if opts.JoinRoundTripper == nil {`
`55`	`54`	`s.log.Info("Cluster already bootstrapped, but we have no join transport. Recovering from storage.")`
`56`	`55`	`return s.recoverWireguard(ctx)`
`57`	`56`	`}`
	`57`	`+ s.log.Info("Cluster already bootstrapped, attempting to rejoin as voter")`
`58`	`58`	`return s.join(ctx, opts)`
`59`	`59`	`}`
`60`	`60`	`s.log.Debug("Cluster not yet bootstrapped, attempting to bootstrap")`