stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vspd: Remove funcName from info/debug logs.

Browse Source 
Including the funcName in informational log messages is not useful for
devs or admins, its just spam which bloats the log file.
This commit is contained in:
jholdstock 2023-09-19 18:11:25 +01:00 committed by Jamie Holdstock
parent 12e61bab65
commit 2994d128fe
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/vspd/update.go
View File

@ -74,8 +74,8 @@ func (v *Vspd) updateUnconfirmed(ctx context.Context, dcrdClient *rpc.DcrdRPC) {
// which expired. Remove it from the db. // which expired. Remove it from the db.
var e *wsrpc.Error var e *wsrpc.Error
if errors.As(err, &e) && e.Code == rpc.ErrNoTxInfo { if errors.As(err, &e) && e.Code == rpc.ErrNoTxInfo {
v.log.Infof("%s: Removing unconfirmed ticket from db - no information available "+ v.log.Infof("Removing unconfirmed ticket from db - no information available "+
"about transaction (ticketHash=%s)", funcName, ticket.Hash) "about transaction (ticketHash=%s)", ticket.Hash)
err = v.db.DeleteTicket(ticket) err = v.db.DeleteTicket(ticket)
if err != nil { if err != nil {
@ -108,7 +108,7 @@ func (v *Vspd) updateUnconfirmed(ctx context.Context, dcrdClient *rpc.DcrdRPC) {
continue continue
} }
v.log.Infof("%s: Ticket confirmed (ticketHash=%s)", funcName, ticket.Hash) v.log.Infof("Ticket confirmed (ticketHash=%s)", ticket.Hash)
} }
} }
} }
@ -134,8 +134,8 @@ func (v *Vspd) broadcastFees(ctx context.Context, dcrdClient *rpc.DcrdRPC) {
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
ticket.FeeTxStatus = database.FeeError ticket.FeeTxStatus = database.FeeError
} else { } else {
v.log.Infof("%s: Fee tx broadcast for ticket (ticketHash=%s, feeHash=%s)", v.log.Infof("Fee tx broadcast for ticket (ticketHash=%s, feeHash=%s)",
funcName, ticket.Hash, ticket.FeeTxHash) ticket.Hash, ticket.FeeTxHash)
ticket.FeeTxStatus = database.FeeBroadcast ticket.FeeTxStatus = database.FeeBroadcast
} }
@ -198,7 +198,7 @@ func (v *Vspd) addToWallets(ctx context.Context, dcrdClient *rpc.DcrdRPC) {
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
continue continue
} }
v.log.Infof("%s: Fee tx confirmed (ticketHash=%s)", funcName, ticket.Hash) v.log.Infof("Fee tx confirmed (ticketHash=%s)", ticket.Hash)
// Add ticket to the voting wallet. // Add ticket to the voting wallet.
@ -254,8 +254,8 @@ func (v *Vspd) addToWallets(ctx context.Context, dcrdClient *rpc.DcrdRPC) {
} }
} }
v.log.Infof("%s: Ticket added to voting wallet (wallet=%s, ticketHash=%s)", v.log.Infof("Ticket added to voting wallet (wallet=%s, ticketHash=%s)",
funcName, walletClient.String(), ticket.Hash) walletClient.String(), ticket.Hash)
} }
} }
} }
@ -322,7 +322,7 @@ func (v *Vspd) setOutcomes(ctx context.Context, dcrdClient *rpc.DcrdRPC) {
continue continue
} }
v.log.Infof("%s: Ticket %s %s at height %d", funcName, v.log.Infof("Ticket %s %s at height %d",
dbTicket.Hash, dbTicket.Outcome, spentTicket.heightSpent) dbTicket.Hash, dbTicket.Outcome, spentTicket.heightSpent)
} }
} }

12
internal/vspd/walletconsistency.go
View File

@ -75,8 +75,8 @@ func (v *Vspd) checkWalletConsistency(ctx context.Context) {
continue continue
} }
v.log.Debugf("%s: Adding missing ticket (wallet=%s, ticketHash=%s)", v.log.Debugf("Adding missing ticket (wallet=%s, ticketHash=%s)",
funcName, walletClient.String(), dbTicket.Hash) walletClient.String(), dbTicket.Hash)
rawTicket, err := dcrdClient.GetRawTransaction(dbTicket.Hash) rawTicket, err := dcrdClient.GetRawTransaction(dbTicket.Hash)
if err != nil { if err != nil {
@ -99,8 +99,8 @@ func (v *Vspd) checkWalletConsistency(ctx context.Context) {
// Perform a rescan if any missing tickets were added to this wallet. // Perform a rescan if any missing tickets were added to this wallet.
if added { if added {
v.log.Infof("%s: Performing a rescan on wallet %s (fromHeight=%d)", v.log.Infof("Performing a rescan on wallet %s (fromHeight=%d)",
funcName, walletClient.String(), minHeight) walletClient.String(), minHeight)
err = walletClient.RescanFrom(minHeight) err = walletClient.RescanFrom(minHeight)
if err != nil { if err != nil {
v.log.Errorf("%s: dcrwallet.RescanFrom failed (wallet=%s): %v", v.log.Errorf("%s: dcrwallet.RescanFrom failed (wallet=%s): %v",
@ -156,8 +156,8 @@ func (v *Vspd) checkWalletConsistency(ctx context.Context) {
continue continue
} }
v.log.Debugf("%s: Updating incorrect consensus vote choices (wallet=%s, agenda=%s, ticketHash=%s)", v.log.Debugf("Updating incorrect consensus vote choices (wallet=%s, agenda=%s, ticketHash=%s)",
funcName, walletClient.String(), dbAgenda, dbTicket.Hash) walletClient.String(), dbAgenda, dbTicket.Hash)
// If db and wallet are not matching, update wallet with correct // If db and wallet are not matching, update wallet with correct
// choice. // choice.