From 5eb83a380afdf45c5f99cc4443dd3abcb3327325 Mon Sep 17 00:00:00 2001 From: rene <41963722+renaynay@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:21:30 +0200 Subject: [PATCH 1/2] chore(share/p2p/discovery): change debug logs to info due as they are infrequent --- nodebuilder/fraud/lifecycle.go | 2 +- nodebuilder/p2p/misc.go | 2 +- share/eds/cache/noop.go | 1 - share/p2p/discovery/discovery.go | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nodebuilder/fraud/lifecycle.go b/nodebuilder/fraud/lifecycle.go index e89eaee3cc..13fcddbd9d 100644 --- a/nodebuilder/fraud/lifecycle.go +++ b/nodebuilder/fraud/lifecycle.go @@ -69,7 +69,7 @@ func (breaker *ServiceBreaker[S, H]) Stop(ctx context.Context) error { if breaker.ctx.Err() != nil { // short circuit if the service was already stopped - return nil + return nil //nolint:nilerr } breaker.sub.Cancel() diff --git a/nodebuilder/p2p/misc.go b/nodebuilder/p2p/misc.go index 0d842e0601..df02e0e623 100644 --- a/nodebuilder/p2p/misc.go +++ b/nodebuilder/p2p/misc.go @@ -7,7 +7,7 @@ import ( "github.com/ipfs/go-datastore" connmgri "github.com/libp2p/go-libp2p/core/connmgr" "github.com/libp2p/go-libp2p/core/peerstore" - "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" //nolint:staticcheck + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" //nolint:staticcheck //nolint:nolintlint "github.com/libp2p/go-libp2p/p2p/net/conngater" "github.com/libp2p/go-libp2p/p2p/net/connmgr" diff --git a/share/eds/cache/noop.go b/share/eds/cache/noop.go index 95a199c345..8e1c17924a 100644 --- a/share/eds/cache/noop.go +++ b/share/eds/cache/noop.go @@ -38,7 +38,6 @@ var _ Accessor = (*NoopAccessor)(nil) type NoopAccessor struct{} func (n NoopAccessor) Blockstore() (dagstore.ReadBlockstore, error) { - //nolint:nilnil return nil, nil } diff --git a/share/p2p/discovery/discovery.go b/share/p2p/discovery/discovery.go index 35cf0afc82..fe99815d94 100644 --- a/share/p2p/discovery/discovery.go +++ b/share/p2p/discovery/discovery.go @@ -170,7 +170,7 @@ func (d *Discovery) Advertise(ctx context.Context) { timer := time.NewTimer(d.params.AdvertiseInterval) defer timer.Stop() for { - log.Debugf("advertising to topic %s", d.tag) + log.Infof("advertising to topic %s", d.tag) _, err := d.disc.Advertise(ctx, d.tag) d.metrics.observeAdvertise(ctx, err) if err != nil { @@ -195,7 +195,7 @@ func (d *Discovery) Advertise(ctx context.Context) { } } - log.Debugf("successfully advertised to topic %s", d.tag) + log.Infof("successfully advertised to topic %s", d.tag) if !timer.Stop() { <-timer.C } From a446f9211d0ad83ba63034b7e0e0fbe7ffba8024 Mon Sep 17 00:00:00 2001 From: rene <41963722+renaynay@users.noreply.github.com> Date: Tue, 11 Jun 2024 13:25:55 +0200 Subject: [PATCH 2/2] lint --- nodebuilder/fraud/lifecycle.go | 2 +- share/eds/cache/noop.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nodebuilder/fraud/lifecycle.go b/nodebuilder/fraud/lifecycle.go index 13fcddbd9d..e89eaee3cc 100644 --- a/nodebuilder/fraud/lifecycle.go +++ b/nodebuilder/fraud/lifecycle.go @@ -69,7 +69,7 @@ func (breaker *ServiceBreaker[S, H]) Stop(ctx context.Context) error { if breaker.ctx.Err() != nil { // short circuit if the service was already stopped - return nil //nolint:nilerr + return nil } breaker.sub.Cancel() diff --git a/share/eds/cache/noop.go b/share/eds/cache/noop.go index 8e1c17924a..5d7444054e 100644 --- a/share/eds/cache/noop.go +++ b/share/eds/cache/noop.go @@ -38,7 +38,7 @@ var _ Accessor = (*NoopAccessor)(nil) type NoopAccessor struct{} func (n NoopAccessor) Blockstore() (dagstore.ReadBlockstore, error) { - return nil, nil + return nil, nil //nolint:nilnil } func (n NoopAccessor) Reader() io.Reader {