refactor(logger): 日志改用 logrus 全局包级调用,移除 Logger 注入接口
为什么:并入宿主项目后须与宿主日志体系一致——宿主统一用 pkg/logger 初始化 logrus 全局实例并直接 logrus.Xxx 包级调用;包一层 Logger 接口会让 logrus 的 caller 定位(报告调用文件:行号)失准。 改动: - 删除 logger 包(Logger 接口 / Default / SetDefault,默认本就是 logrus.StandardLogger) - 11 个结构体移除 lgr logger.Logger 字段、SetLogger 方法及构造中的 lgr 初始化 - 192 处 lgr.Xxxf 调用改为 logrus.Xxxf,日志消息文本保持不变 - xiaomi.Client 移除 Logger() 访问器,air_conditioner 回读日志去掉判空调用直连 logrus - miot_i18n.go 两处标准库 log.Printf 改为 logrus.Errorf,统一日志出口 - go.mod:logrus 从 indirect 提升为直接依赖 - goimports/goformat 全树规范化:此前部分文件未 gofmt(单行 if、对齐),本次顺带 格式化,纯空白/换行变化,无逻辑改动 验证:go build / go vet / go test ./... 全部通过(bridge、miot、xiaomi、devices、specs)
This commit is contained in:
+5
-11
@@ -12,7 +12,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"xiaomihome/logger"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// ============================================================================
|
||||
@@ -71,8 +71,6 @@ func (n *NetworkInfo) String() string {
|
||||
type MIoTNetwork struct {
|
||||
mu sync.Mutex
|
||||
|
||||
lgr logger.Logger
|
||||
|
||||
// Detection addresses with cached response times (seconds)
|
||||
ipAddrMap map[string]float64
|
||||
httpAddrMap map[string]float64
|
||||
@@ -99,9 +97,9 @@ type MIoTNetwork struct {
|
||||
// Default network detection addresses.
|
||||
var (
|
||||
defaultIPAddrs = []string{
|
||||
"1.2.4.8", // CNNIC sDNS
|
||||
"8.8.8.8", // Google Public DNS
|
||||
"9.9.9.9", // Quad9
|
||||
"1.2.4.8", // CNNIC sDNS
|
||||
"8.8.8.8", // Google Public DNS
|
||||
"9.9.9.9", // Quad9
|
||||
}
|
||||
defaultHTTPAddrs = []string{
|
||||
"https://www.bing.com",
|
||||
@@ -126,7 +124,6 @@ func NewMIoTNetwork(ipAddrList, urlAddrList []string, refreshInterval time.Durat
|
||||
}
|
||||
|
||||
n := &MIoTNetwork{
|
||||
lgr: logger.Default(),
|
||||
ipAddrMap: make(map[string]float64),
|
||||
httpAddrMap: make(map[string]float64),
|
||||
httpClient: &http.Client{Timeout: defaultDetectTimeout},
|
||||
@@ -149,9 +146,6 @@ func NewMIoTNetwork(ipAddrList, urlAddrList []string, refreshInterval time.Durat
|
||||
return n
|
||||
}
|
||||
|
||||
// SetLogger sets a custom logger for MIoTNetwork.
|
||||
func (n *MIoTNetwork) SetLogger(l logger.Logger) { n.lgr = l }
|
||||
|
||||
// Init starts the network monitor.
|
||||
func (n *MIoTNetwork) Init() {
|
||||
// Initial refresh
|
||||
@@ -530,7 +524,7 @@ func (n *MIoTNetwork) getNetworkInterfaces() map[string]*NetworkInfo {
|
||||
|
||||
ifaces, err := net.Interfaces()
|
||||
if err != nil {
|
||||
n.lgr.Warnf("[network] get interfaces error: %v", err)
|
||||
logrus.Warnf("[network] get interfaces error: %v", err)
|
||||
return results
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user