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:
@@ -4,6 +4,8 @@ package miot
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// ============================================================================
|
||||
@@ -40,7 +42,7 @@ func (c *MIoTClient) SetProp(did string, siid, piid int, value interface{}) erro
|
||||
if results[0].Code != 0 && results[0].Code != 1 {
|
||||
// 设备移除或离线:刷新设备列表(Aligns with Python)
|
||||
if results[0].Code == -704010000 || results[0].Code == -704042011 {
|
||||
c.lgr.Errorf("[MIoTClient] device may be removed or offline, %s\n", did)
|
||||
logrus.Errorf("[MIoTClient] device may be removed or offline, %s\n", did)
|
||||
if devs, rerr := c.http.GetDevices(nil); rerr == nil {
|
||||
c.deviceListMu.Lock()
|
||||
for k := range c.deviceListCloud {
|
||||
@@ -54,7 +56,7 @@ func (c *MIoTClient) SetProp(did string, siid, piid int, value interface{}) erro
|
||||
return fmt.Errorf("set property failed, code=%d", results[0].Code)
|
||||
}
|
||||
|
||||
c.lgr.Infof("[MIoTClient] SetProp: %s/%d/%d = %v\n", did, siid, piid, value)
|
||||
logrus.Infof("[MIoTClient] SetProp: %s/%d/%d = %v\n", did, siid, piid, value)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -86,7 +88,7 @@ func (c *MIoTClient) GetProp(did string, siid, piid int) (interface{}, error) {
|
||||
return nil, fmt.Errorf("get property failed, code=%d", results[0].Code)
|
||||
}
|
||||
|
||||
c.lgr.Infof("[MIoTClient] GetProp: %s/%d/%d = %v\n", did, siid, piid, results[0].Value)
|
||||
logrus.Infof("[MIoTClient] GetProp: %s/%d/%d = %v\n", did, siid, piid, results[0].Value)
|
||||
return results[0].Value, nil
|
||||
}
|
||||
|
||||
@@ -107,7 +109,7 @@ func (c *MIoTClient) Action(did string, siid, aiid int, inList []interface{}) (m
|
||||
return nil, err
|
||||
}
|
||||
|
||||
c.lgr.Infof("[MIoTClient] Action: %s/%d/%d, result=%v\n", did, siid, aiid, result)
|
||||
logrus.Infof("[MIoTClient] Action: %s/%d/%d, result=%v\n", did, siid, aiid, result)
|
||||
return result, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user