cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

reduce code duplication

Browse Source
This commit is contained in:
lanzafame 2020-08-28 16:53:59 +10:00
parent 3ebe4ebb3d
commit 0254e4b365
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chain/sub/incoming.go
View File

@ -576,51 +576,31 @@ func (mv *MessageValidator) validateLocalMessage(ctx context.Context, msg *pubsu
m, err := types.DecodeSignedMessage(msg.Message.GetData()) m, err := types.DecodeSignedMessage(msg.Message.GetData())
if err != nil { if err != nil {
log.Warnf("failed to decode local message: %s", err) log.Warnf("failed to decode local message: %s", err)
ctx, _ = tag.New( recordFailure(ctx, metrics.MessageValidationFailure, "decode")
ctx,
tag.Upsert(metrics.FailureType, "decode"),
)
stats.Record(ctx, metrics.MessageValidationFailure.M(1))
return pubsub.ValidationIgnore return pubsub.ValidationIgnore
} }
if m.Size() > 32*1024 { if m.Size() > 32*1024 {
log.Warnf("local message is too large! (%dB)", m.Size()) log.Warnf("local message is too large! (%dB)", m.Size())
ctx, _ = tag.New( recordFailure(ctx, metrics.MessageValidationFailure, "oversize")
ctx,
tag.Upsert(metrics.FailureType, "oversize"),
)
stats.Record(ctx, metrics.MessageValidationFailure.M(1))
return pubsub.ValidationIgnore return pubsub.ValidationIgnore
} }
if m.Message.To == address.Undef { if m.Message.To == address.Undef {
log.Warn("local message has invalid destination address") log.Warn("local message has invalid destination address")
ctx, _ = tag.New( recordFailure(ctx, metrics.MessageValidationFailure, "undef-addr")
ctx,
tag.Upsert(metrics.FailureType, "undef-addr"),
)
stats.Record(ctx, metrics.MessageValidationFailure.M(1))
return pubsub.ValidationIgnore return pubsub.ValidationIgnore
} }
if !m.Message.Value.LessThan(types.TotalFilecoinInt) { if !m.Message.Value.LessThan(types.TotalFilecoinInt) {
log.Warnf("local messages has too high value: %s", m.Message.Value) log.Warnf("local messages has too high value: %s", m.Message.Value)
ctx, _ = tag.New( recordFailure(ctx, metrics.MessageValidationFailure, "value-too-high")
ctx,
tag.Upsert(metrics.FailureType, "value-too-high"),
)
stats.Record(ctx, metrics.MessageValidationFailure.M(1))
return pubsub.ValidationIgnore return pubsub.ValidationIgnore
} }
if err := mv.mpool.VerifyMsgSig(m); err != nil { if err := mv.mpool.VerifyMsgSig(m); err != nil {
log.Warnf("signature verification failed for local message: %s", err) log.Warnf("signature verification failed for local message: %s", err)
ctx, _ = tag.New( recordFailure(ctx, metrics.MessageValidationFailure, "verify-sig")
ctx,
tag.Upsert(metrics.FailureType, "verify-sig"),
)
stats.Record(ctx, metrics.MessageValidationFailure.M(1))
return pubsub.ValidationIgnore return pubsub.ValidationIgnore
} }
@ -643,3 +623,11 @@ func HandleIncomingMessages(ctx context.Context, mpool *messagepool.MessagePool,
// Do nothing... everything happens in validate // Do nothing... everything happens in validate
} }
} }
func recordFailure(ctx context.Context, metric *stats.Int64Measure, failureType string) {
ctx, _ = tag.New(
ctx,
tag.Upsert(metrics.FailureType, failureType),
)
stats.Record(ctx, metric.M(1))
}