certusone
/
vouch
mirror of https://github.com/certusone/vouch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tidy up logging

This commit is contained in:
Jim McDonald 2020-09-29 17:48:22 +01:00
parent 75576b1303
commit eeab9d48f7
No known key found for this signature in database
GPG Key ID: 89CEB61B2AD2A5E7
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/submitter/multinode/submitaggregateattestation.go
View File

@ -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()

4
services/submitter/multinode/submitattestation.go
View File

@ -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()

4
services/submitter/multinode/submitbeaconblock.go
View File

@ -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()

4
services/submitter/multinode/submitbeaconcommitteesubscriptions.go
View File

@ -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()