Skip to content

Fix incorrect log condition #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laodouya merged 2 commits into from
May 15, 2019
Merged

Fix incorrect log condition #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c637d63
Fix incorrect log condition
leventeliu May 15, 2019
94e5d57
Make tx log informative
leventeliu May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blockproducer/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ func (c *Chain) syncCurrentHead(ctx context.Context, requiredReachable uint32) (
log.Fatalf("unknown run mode: %v", c.mode)
}

if ok {
if !ok {
log.WithFields(log.Fields{
"peer": c.getLocalBPInfo(),
"sync_head_height": currentHeight,
Expand Down
10 changes: 8 additions & 2 deletions blockproducer/metastate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,16 +1173,22 @@ func (s *metaState) generateGenesisBlock(dbID proto.DatabaseID, tx *types.Create
}

func (s *metaState) apply(t pi.Transaction, height uint32) (err error) {
log.Infof("get tx: %s", t.GetTransactionType())
// NOTE(leventeliu): bypass pool in this method.
var (
addr = t.GetAccountAddress()
nonce = t.GetAccountNonce()
ttype = t.GetTransactionType()
)
log.WithFields(log.Fields{
"type": ttype,
"hash": t.Hash(),
"addr": addr,
"nonce": nonce,
}).Infof("apply tx")
// Check account nonce
var nextNonce pi.AccountNonce
if nextNonce, err = s.nextNonce(addr); err != nil {
if t.GetTransactionType() != pi.TransactionTypeBaseAccount {
if ttype != pi.TransactionTypeBaseAccount {
return
}
// Consider the first nonce 0
Expand Down