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

using zap.NewNop() ignores configured log level 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2021-02-04 17:08:24 +01:00 committed by Jakub
parent 78892847ee
commit b22a261bc2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protocol/encryption/publisher/publisher.go
View File

@ -8,6 +8,7 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/logutils"
) )
const ( const (
@ -32,7 +33,7 @@ type Publisher struct {
func New(logger *zap.Logger) *Publisher { func New(logger *zap.Logger) *Publisher {
if logger == nil { if logger == nil {
logger = zap.NewNop() logger = logutils.ZapLogger()
} }
return &Publisher{ return &Publisher{

14
waku/waku.go
View File

@ -38,13 +38,13 @@ import (
gethcommon "github.com/ethereum/go-ethereum/common" gethcommon "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/logutils"
"github.com/status-im/status-go/waku/common" "github.com/status-im/status-go/waku/common"
v0 "github.com/status-im/status-go/waku/v0" v0 "github.com/status-im/status-go/waku/v0"
v1 "github.com/status-im/status-go/waku/v1" v1 "github.com/status-im/status-go/waku/v1"
@ -116,7 +116,7 @@ type Waku struct {
// New creates a Waku client ready to communicate through the Ethereum P2P network. // New creates a Waku client ready to communicate through the Ethereum P2P network.
func New(cfg *Config, logger *zap.Logger) *Waku { func New(cfg *Config, logger *zap.Logger) *Waku {
if logger == nil { if logger == nil {
logger = zap.NewNop() logger = logutils.ZapLogger()
} }
logger.Debug("starting waku with config", zap.Any("config", cfg)) logger.Debug("starting waku with config", zap.Any("config", cfg))
@ -1331,7 +1331,7 @@ func (w *Waku) addAndBridge(envelope *common.Envelope, isP2P bool, bridged bool)
if sent > now { if sent > now {
if sent-common.DefaultSyncAllowance > now { if sent-common.DefaultSyncAllowance > now {
common.EnvelopesCacheFailedCounter.WithLabelValues("in_future").Inc() common.EnvelopesCacheFailedCounter.WithLabelValues("in_future").Inc()
log.Warn("envelope created in the future", "hash", envelope.Hash()) w.logger.Warn("envelope created in the future", zap.ByteString("hash", envelope.Hash().Bytes()))
return false, common.TimeSyncError(errors.New("envelope from future")) return false, common.TimeSyncError(errors.New("envelope from future"))
} }
// recalculate PoW, adjusted for the time difference, plus one second for latency // recalculate PoW, adjusted for the time difference, plus one second for latency
@ -1341,10 +1341,10 @@ func (w *Waku) addAndBridge(envelope *common.Envelope, isP2P bool, bridged bool)
if envelope.Expiry < now { if envelope.Expiry < now {
if envelope.Expiry+common.DefaultSyncAllowance*2 < now { if envelope.Expiry+common.DefaultSyncAllowance*2 < now {
common.EnvelopesCacheFailedCounter.WithLabelValues("very_old").Inc() common.EnvelopesCacheFailedCounter.WithLabelValues("very_old").Inc()
log.Warn("very old envelope", "hash", envelope.Hash()) w.logger.Warn("very old envelope", zap.ByteString("hash", envelope.Hash().Bytes()))
return false, common.TimeSyncError(errors.New("very old envelope")) return false, common.TimeSyncError(errors.New("very old envelope"))
} }
log.Debug("expired envelope dropped", "hash", envelope.Hash().Hex()) w.logger.Debug("expired envelope dropped", zap.ByteString("hash", envelope.Hash().Bytes()))
common.EnvelopesCacheFailedCounter.WithLabelValues("expired").Inc() common.EnvelopesCacheFailedCounter.WithLabelValues("expired").Inc()
return false, nil // drop envelope without error return false, nil // drop envelope without error
} }
@ -1383,10 +1383,8 @@ func (w *Waku) addAndBridge(envelope *common.Envelope, isP2P bool, bridged bool)
} }
if alreadyCached { if alreadyCached {
log.Trace("w envelope already cached", "hash", envelope.Hash().Hex())
common.EnvelopesCachedCounter.WithLabelValues("hit").Inc() common.EnvelopesCachedCounter.WithLabelValues("hit").Inc()
} else { } else {
log.Trace("cached w envelope", "hash", envelope.Hash().Hex())
common.EnvelopesCachedCounter.WithLabelValues("miss").Inc() common.EnvelopesCachedCounter.WithLabelValues("miss").Inc()
common.EnvelopesSizeMeter.Observe(float64(envelope.Size())) common.EnvelopesSizeMeter.Observe(float64(envelope.Size()))
w.postEvent(envelope, isP2P) // notify the local node about the new message w.postEvent(envelope, isP2P) // notify the local node about the new message
@ -1402,7 +1400,7 @@ func (w *Waku) addAndBridge(envelope *common.Envelope, isP2P bool, bridged bool)
// In particular, if a node is a lightweight node, // In particular, if a node is a lightweight node,
// it should not bridge any envelopes. // it should not bridge any envelopes.
if !isP2P && !bridged && w.bridge != nil { if !isP2P && !bridged && w.bridge != nil {
log.Debug("bridging envelope from Waku", "hash", envelope.Hash().Hex()) w.logger.Debug("bridging envelope from Waku", zap.ByteString("hash", envelope.Hash().Bytes()))
_, in := w.bridge.Pipe() _, in := w.bridge.Pipe()
in <- envelope in <- envelope
common.BridgeSent.Inc() common.BridgeSent.Inc()