gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accounts, cmd: port packages over to the new logging system

Browse Source
This commit is contained in:
Péter Szilágyi
2017-02-22 16:58:00 +02:00
parent 61e6bb1247
commit 23a5d64fd0
10 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/keystore/account_cache.go
View File

@ -210,7 +210,7 @@ func (ac *accountCache) close() {
func (ac *accountCache) reload() {
accounts, err := ac.scan()
if err != nil {
log.Debug(fmt.Sprintf("can't load keys: %v", err))
log.Debug("Failed to reload keystore contents", "error", err)
}
ac.all = accounts
sort.Sort(ac.all)
@ -224,7 +224,7 @@ func (ac *accountCache) reload() {
case ac.notify <- struct{}{}:
default:
}
log.Debug(fmt.Sprintf("reloaded keys, cache has %d accounts", len(ac.all)))
log.Debug("Reloaded keystore contents", "accounts", len(ac.all))
}
func (ac *accountCache) scan() ([]accounts.Account, error) {
@ -243,12 +243,14 @@ func (ac *accountCache) scan() ([]accounts.Account, error) {
for _, fi := range files {
path := filepath.Join(ac.keydir, fi.Name())
if skipKeyFile(fi) {
log.Trace(fmt.Sprintf("ignoring file %s", path))
log.Trace("Ignoring file on account scan", "path", path)
continue
}
logger := log.New("path", path)
fd, err := os.Open(path)
if err != nil {
log.Trace(fmt.Sprint(err))
logger.Trace("Failed to open keystore file", "error", err)
continue
}
buf.Reset(fd)
@ -258,9 +260,9 @@ func (ac *accountCache) scan() ([]accounts.Account, error) {
addr := common.HexToAddress(keyJSON.Address)
switch {
case err != nil:
log.Debug(fmt.Sprintf("can't decode key %s: %v", path, err))
logger.Debug("Failed to decode keystore key", "error", err)
case (addr == common.Address{}):
log.Debug(fmt.Sprintf("can't decode key %s: missing or zero address", path))
logger.Debug("Failed to decode keystore key", "error", "missing or zero address")
default:
addrs = append(addrs, accounts.Account{Address: addr, URL: accounts.URL{Scheme: KeyStoreScheme, Path: path}})
}