status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update mailserver metrics for archived envelopes (#1035)

This commit is contained in:
Adam Babik 2018-06-15 11:19:17 +02:00 committed by GitHub
parent 354e23aaf5
commit b3a8991eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mailserver/mailserver.go
View File

@ -43,11 +43,14 @@ var (
errPasswordNotProvided = errors.New("password is not specified") errPasswordNotProvided = errors.New("password is not specified")
// By default go-ethereum/metrics creates dummy metrics that don't register anything. // By default go-ethereum/metrics creates dummy metrics that don't register anything.
// Real metrics are collected only if -metrics flag is set // Real metrics are collected only if -metrics flag is set
requestProcessTimer = metrics.NewRegisteredTimer("mailserver/processTime", nil) requestProcessTimer = metrics.NewRegisteredTimer("mailserver/requestProcessTime", nil)
requestsCounter = metrics.NewRegisteredCounter("mailserver/requests", nil) requestsMeter = metrics.NewRegisteredMeter("mailserver/requests", nil)
requestErrorsCounter = metrics.NewRegisteredCounter("mailserver/requestErrors", nil) requestErrorsCounter = metrics.NewRegisteredCounter("mailserver/requestErrors", nil)
sentEnvelopesMeter = metrics.NewRegisteredMeter("mailserver/envelopes", nil) sentEnvelopesMeter = metrics.NewRegisteredMeter("mailserver/sentEnvelopes", nil)
sentEnvelopesSizeMeter = metrics.NewRegisteredMeter("mailserver/envelopesSize", nil) sentEnvelopesSizeMeter = metrics.NewRegisteredMeter("mailserver/sentEnvelopesSize", nil)
archivedMeter = metrics.NewRegisteredMeter("mailserver/archivedEnvelopes", nil)
archivedSizeMeter = metrics.NewRegisteredMeter("mailserver/archivedEnvelopesSize", nil)
archivedErrorsCounter = metrics.NewRegisteredCounter("mailserver/archiveErrors", nil)
) )
// WMailServer whisper mailserver. // WMailServer whisper mailserver.
@ -159,17 +162,21 @@ func (s *WMailServer) Archive(env *whisper.Envelope) {
rawEnvelope, err := rlp.EncodeToBytes(env) rawEnvelope, err := rlp.EncodeToBytes(env)
if err != nil { if err != nil {
log.Error(fmt.Sprintf("rlp.EncodeToBytes failed: %s", err)) log.Error(fmt.Sprintf("rlp.EncodeToBytes failed: %s", err))
archivedErrorsCounter.Inc(1)
} else { } else {
if err = s.db.Put(key.raw, rawEnvelope, nil); err != nil { if err = s.db.Put(key.raw, rawEnvelope, nil); err != nil {
log.Error(fmt.Sprintf("Writing to DB failed: %s", err)) log.Error(fmt.Sprintf("Writing to DB failed: %s", err))
archivedErrorsCounter.Inc(1)
} }
archivedMeter.Mark(1)
archivedSizeMeter.Mark(int64(whisper.EnvelopeHeaderLength + len(env.Data)))
} }
} }
// DeliverMail sends mail to specified whisper peer. // DeliverMail sends mail to specified whisper peer.
func (s *WMailServer) DeliverMail(peer *whisper.Peer, request *whisper.Envelope) { func (s *WMailServer) DeliverMail(peer *whisper.Peer, request *whisper.Envelope) {
log.Info("Delivering mail", "peer", peer.ID) log.Info("Delivering mail", "peer", peer.ID)
requestsCounter.Inc(1) requestsMeter.Mark(1)
if peer == nil { if peer == nil {
requestErrorsCounter.Inc(1) requestErrorsCounter.Inc(1)