From eeab9d48f79e1282363502b5fd3a567e2aa63e6d Mon Sep 17 00:00:00 2001 From: Jim McDonald Date: Tue, 29 Sep 2020 17:48:22 +0100 Subject: [PATCH] Tidy up logging --- services/submitter/multinode/submitaggregateattestation.go | 4 +++- services/submitter/multinode/submitattestation.go | 4 +++- services/submitter/multinode/submitbeaconblock.go | 4 +++- .../submitter/multinode/submitbeaconcommitteesubscriptions.go | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/services/submitter/multinode/submitaggregateattestation.go b/services/submitter/multinode/submitaggregateattestation.go index c946552..a36da7f 100644 --- a/services/submitter/multinode/submitaggregateattestation.go +++ b/services/submitter/multinode/submitaggregateattestation.go @@ -41,6 +41,7 @@ func (s *Service) SubmitAggregateAttestation(ctx context.Context, aggregate *spe submitter eth2client.AggregateAttestationsSubmitter, ) { defer wg.Done() + log := log.With().Str("submitter", name).Uint64("slot", aggregate.Message.Aggregate.Data.Slot).Logger() if err := sem.Acquire(ctx, 1); err != nil { log.Error().Err(err).Msg("Failed to acquire semaphore") return @@ -48,9 +49,10 @@ func (s *Service) SubmitAggregateAttestation(ctx context.Context, aggregate *spe defer sem.Release(1) if err := submitter.SubmitAggregateAttestations(ctx, []*spec.SignedAggregateAndProof{aggregate}); err != nil { - log.Warn().Str("submitter", name).Uint64("slot", aggregate.Message.Aggregate.Data.Slot).Err(err).Msg("Failed to submit aggregate attestation") + log.Warn().Err(err).Msg("Failed to submit aggregate attestation") return } + log.Trace().Msg("Submitted aggregate attestation") }(ctx, sem, &wg, name, submitter) } wg.Wait() diff --git a/services/submitter/multinode/submitattestation.go b/services/submitter/multinode/submitattestation.go index ccb2470..5f0f1a5 100644 --- a/services/submitter/multinode/submitattestation.go +++ b/services/submitter/multinode/submitattestation.go @@ -41,6 +41,7 @@ func (s *Service) SubmitAttestation(ctx context.Context, attestation *spec.Attes submitter eth2client.AttestationSubmitter, ) { defer wg.Done() + log := log.With().Str("submitter", name).Uint64("slot", attestation.Data.Slot).Logger() if err := sem.Acquire(ctx, 1); err != nil { log.Error().Err(err).Msg("Failed to acquire semaphore") return @@ -48,9 +49,10 @@ func (s *Service) SubmitAttestation(ctx context.Context, attestation *spec.Attes defer sem.Release(1) if err := submitter.SubmitAttestation(ctx, attestation); err != nil { - log.Warn().Str("submitter", name).Uint64("slot", attestation.Data.Slot).Err(err).Msg("Failed to submit attestation") + log.Warn().Msg("Failed to submit attestation") return } + log.Trace().Msg("Submitted attestation") }(ctx, sem, &wg, name, submitter) } wg.Wait() diff --git a/services/submitter/multinode/submitbeaconblock.go b/services/submitter/multinode/submitbeaconblock.go index 772fa63..9447d85 100644 --- a/services/submitter/multinode/submitbeaconblock.go +++ b/services/submitter/multinode/submitbeaconblock.go @@ -41,6 +41,7 @@ func (s *Service) SubmitBeaconBlock(ctx context.Context, block *spec.SignedBeaco submitter eth2client.BeaconBlockSubmitter, ) { defer wg.Done() + log := log.With().Str("submitter", name).Uint64("slot", block.Message.Slot).Logger() if err := sem.Acquire(ctx, 1); err != nil { log.Error().Err(err).Msg("Failed to acquire semaphore") return @@ -48,9 +49,10 @@ func (s *Service) SubmitBeaconBlock(ctx context.Context, block *spec.SignedBeaco defer sem.Release(1) if err := submitter.SubmitBeaconBlock(ctx, block); err != nil { - log.Warn().Str("submitter", name).Uint64("slot", block.Message.Slot).Err(err).Msg("Failed to submit beacon block") + log.Warn().Err(err).Msg("Failed to submit beacon block") return } + log.Trace().Msg("Submitted beacon block") }(ctx, sem, &wg, name, submitter) } wg.Wait() diff --git a/services/submitter/multinode/submitbeaconcommitteesubscriptions.go b/services/submitter/multinode/submitbeaconcommitteesubscriptions.go index fed823c..1690680 100644 --- a/services/submitter/multinode/submitbeaconcommitteesubscriptions.go +++ b/services/submitter/multinode/submitbeaconcommitteesubscriptions.go @@ -54,6 +54,7 @@ func (s *Service) SubmitBeaconCommitteeSubscriptions(ctx context.Context, subscr submitter eth2client.BeaconCommitteeSubscriptionsSubmitter, ) { defer wg.Done() + log := log.With().Str("submitter", name).Int("subscriptions", len(subs)).Logger() if err := sem.Acquire(ctx, 1); err != nil { log.Error().Err(err).Msg("Failed to acquire semaphore") return @@ -61,9 +62,10 @@ func (s *Service) SubmitBeaconCommitteeSubscriptions(ctx context.Context, subscr defer sem.Release(1) if err := submitter.SubmitBeaconCommitteeSubscriptions(ctx, subs); err != nil { - log.Warn().Str("submitter", name).Err(err).Msg("Failed to submit beacon committee subscription") + log.Warn().Err(err).Msg("Failed to submit beacon committee subscription") return } + log.Trace().Msg("Submitted beacon committee subscriptions") }(ctx, sem, &wg, name, submitter) } wg.Wait()