From 9a529d64d14f8ebf677e69cf1b5de836ca215049 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <gballet@gmail.com>
Date: Thu, 28 Nov 2019 10:53:06 +0100
Subject: [PATCH] log: fix staticcheck warnings (#20388)
---
log/handler_glog.go | 6 +++---
log/logger.go | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/log/handler_glog.go b/log/handler_glog.go
index 83dae44bd..9b1d4efaf 100644
--- a/log/handler_glog.go
+++ b/log/handler_glog.go
@@ -207,7 +207,7 @@ func (h *GlogHandler) Log(r *Record) error {
}
// Check callsite cache for previously calculated log levels
h.lock.RLock()
- lvl, ok := h.siteCache[r.Call.PC()]
+ lvl, ok := h.siteCache[r.Call.Frame().PC]
h.lock.RUnlock()
// If we didn't cache the callsite yet, calculate it
@@ -215,13 +215,13 @@ func (h *GlogHandler) Log(r *Record) error {
h.lock.Lock()
for _, rule := range h.patterns {
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
}
}
// If no rule matched, remember to drop log the next time
if !ok {
- h.siteCache[r.Call.PC()] = 0
+ h.siteCache[r.Call.Frame().PC] = 0
}
h.lock.Unlock()
}
diff --git a/log/logger.go b/log/logger.go
index ca3e0b059..276d6969e 100644
--- a/log/logger.go
+++ b/log/logger.go
@@ -83,7 +83,7 @@ func LvlFromString(lvlString string) (Lvl, error) {
case "crit":
return LvlCrit, nil
default:
- return LvlDebug, fmt.Errorf("Unknown level: %v", lvlString)
+ return LvlDebug, fmt.Errorf("unknown level: %v", lvlString)
}
}
--
GitLab