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

Update log format

Browse Source
This commit is contained in:
jholdstock 2020-06-30 11:25:11 +01:00 committed by David Hill
parent c05cdc0069
commit da410b5060
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpc/dcrwallet.go
View File

@ -66,19 +66,19 @@ func (w *WalletConnect) Clients(ctx context.Context, netParams *chaincfg.Params)
var verMap map[string]dcrdtypes.VersionResult var verMap map[string]dcrdtypes.VersionResult
err = c.Call(ctx, "version", &verMap) err = c.Call(ctx, "version", &verMap)
if err != nil { if err != nil {
log.Errorf("version check on dcrwallet '%s' failed: %v", c.String(), err) log.Errorf("dcrwallet.Version error (wallet=%s): %v", c.String(), err)
failedConnections = append(failedConnections, connect.addr) failedConnections = append(failedConnections, connect.addr)
continue continue
} }
walletVersion, exists := verMap["dcrwalletjsonrpcapi"] walletVersion, exists := verMap["dcrwalletjsonrpcapi"]
if !exists { if !exists {
log.Errorf("version response on dcrwallet '%s' missing 'dcrwalletjsonrpcapi'", log.Errorf("dcrwallet.Version response missing 'dcrwalletjsonrpcapi' (wallet=%s)",
c.String()) c.String())
failedConnections = append(failedConnections, connect.addr) failedConnections = append(failedConnections, connect.addr)
continue continue
} }
if walletVersion.VersionString != requiredWalletVersion { if walletVersion.VersionString != requiredWalletVersion {
log.Errorf("dcrwallet '%s' has wrong RPC version: got %s, expected %s", log.Errorf("dcrwallet has wrong RPC version (wallet=%s): got %s, expected %s",
c.String(), walletVersion.VersionString, requiredWalletVersion) c.String(), walletVersion.VersionString, requiredWalletVersion)
failedConnections = append(failedConnections, connect.addr) failedConnections = append(failedConnections, connect.addr)
continue continue
@ -88,12 +88,13 @@ func (w *WalletConnect) Clients(ctx context.Context, netParams *chaincfg.Params)
var netID wire.CurrencyNet var netID wire.CurrencyNet
err = c.Call(ctx, "getcurrentnet", &netID) err = c.Call(ctx, "getcurrentnet", &netID)
if err != nil { if err != nil {
log.Errorf("getcurrentnet check on dcrwallet '%s' failed: %v", c.String(), err) log.Errorf("dcrwallet.GetCurrentNet error (wallet=%s): %v", c.String(), err)
failedConnections = append(failedConnections, connect.addr) failedConnections = append(failedConnections, connect.addr)
continue continue
} }
if netID != netParams.Net { if netID != netParams.Net {
log.Errorf("dcrwallet '%s' running on %s, expected %s", c.String(), netID, netParams.Net) log.Errorf("dcrwallet on wrong network (wallet=%s): running on %s, expected %s",
c.String(), netID, netParams.Net)
failedConnections = append(failedConnections, connect.addr) failedConnections = append(failedConnections, connect.addr)
continue continue
} }
@ -102,7 +103,7 @@ func (w *WalletConnect) Clients(ctx context.Context, netParams *chaincfg.Params)
walletRPC := &WalletRPC{c, ctx} walletRPC := &WalletRPC{c, ctx}
walletInfo, err := walletRPC.WalletInfo() walletInfo, err := walletRPC.WalletInfo()
if err != nil { if err != nil {
log.Errorf("walletinfo check on dcrwallet '%s' failed: %v", c.String(), err) log.Errorf("dcrwallet.WalletInfo error (wallet=%s): %v", c.String(), err)
failedConnections = append(failedConnections, connect.addr) failedConnections = append(failedConnections, connect.addr)
continue continue
} }
@ -110,12 +111,12 @@ func (w *WalletConnect) Clients(ctx context.Context, netParams *chaincfg.Params)
if !walletInfo.Voting { if !walletInfo.Voting {
// All wallet RPCs can still be used if voting is disabled, so just // All wallet RPCs can still be used if voting is disabled, so just
// log an error here. Don't count this as a failed connection. // log an error here. Don't count this as a failed connection.
log.Errorf("wallet '%s' has voting disabled", c.String()) log.Errorf("wallet is not voting (wallet=%s)", c.String())
} }
if !walletInfo.Unlocked { if !walletInfo.Unlocked {
// SetVoteChoice can still be used even if the wallet is locked, so // SetVoteChoice can still be used even if the wallet is locked, so
// just log an error here. Don't count this as a failed connection. // just log an error here. Don't count this as a failed connection.
log.Errorf("wallet '%s' is not unlocked", c.String()) log.Errorf("wallet is not unlocked (wallet=%s)", c.String())
} }
walletClients = append(walletClients, walletRPC) walletClients = append(walletClients, walletRPC)