tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: fix staticcheck warnings (#20388)

Browse Source
This commit is contained in:
Guillaume Ballet 2019-11-28 10:53:06 +01:00 committed by Felix Lange
parent a91b704b01
commit 9a529d64d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
log/handler_glog.go
View File

@ -207,7 +207,7 @@ func (h *GlogHandler) Log(r *Record) error {
} }
// Check callsite cache for previously calculated log levels // Check callsite cache for previously calculated log levels
h.lock.RLock() h.lock.RLock()
lvl, ok := h.siteCache[r.Call.PC()] lvl, ok := h.siteCache[r.Call.Frame().PC]
h.lock.RUnlock() h.lock.RUnlock()
// If we didn't cache the callsite yet, calculate it // If we didn't cache the callsite yet, calculate it
@ -215,13 +215,13 @@ func (h *GlogHandler) Log(r *Record) error {
h.lock.Lock() h.lock.Lock()
for _, rule := range h.patterns { for _, rule := range h.patterns {
if rule.pattern.MatchString(fmt.Sprintf("%+s", r.Call)) { if rule.pattern.MatchString(fmt.Sprintf("%+s", r.Call)) {
h.siteCache[r.Call.PC()], lvl, ok = rule.level, rule.level, true h.siteCache[r.Call.Frame().PC], lvl, ok = rule.level, rule.level, true
break break
} }
} }
// If no rule matched, remember to drop log the next time // If no rule matched, remember to drop log the next time
if !ok { if !ok {
h.siteCache[r.Call.PC()] = 0 h.siteCache[r.Call.Frame().PC] = 0
} }
h.lock.Unlock() h.lock.Unlock()
} }

2
log/logger.go
View File

@ -83,7 +83,7 @@ func LvlFromString(lvlString string) (Lvl, error) {
case "crit": case "crit":
return LvlCrit, nil return LvlCrit, nil
default: default:
return LvlDebug, fmt.Errorf("Unknown level: %v", lvlString) return LvlDebug, fmt.Errorf("unknown level: %v", lvlString)
} }
} }