golib/xiaomihome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(logger): 日志改用 logrus 全局包级调用，移除 Logger 注入接口

Browse Source 
为什么：并入宿主项目后须与宿主日志体系一致——宿主统一用 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:
4566704
2026-09-15 20:16:26 +08:00
parent 7ae32bd012
commit 2b7de69403
46 changed files with 1166 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridge/subscribe.go
+20 -14
View File
@@ -6,6 +6,8 @@ import (
"xiaomihome/xiaomi"
"xiaomihome/xiaomi/devices"
"github.com/sirupsen/logrus"
)
// ── 回调 ──
@@ -88,7 +90,9 @@ func (b *Bridge) subscribeDevice(did string, d interface{}) {
})
}
// 订阅设备在线/离线
if bd, ok := d.(interface{ SubDeviceState(xiaomi.DeviceStateHandler) error }); ok {
if bd, ok := d.(interface {
SubDeviceState(xiaomi.DeviceStateHandler) error
}); ok {
if err := bd.SubDeviceState(func(did string, state xiaomi.DeviceState) {
online := state == xiaomi.StateOnline
b.fireOnline(did, online)
@@ -96,7 +100,7 @@ func (b *Bridge) subscribeDevice(did string, d interface{}) {
go b.client.RefreshDeviceAllProps(did)
}
}); err != nil {
b.lgr.Warnf("[bridge] %d SubDeviceState %s: %v", b.id, did, err)
logrus.Warnf("[bridge] %d SubDeviceState %s: %v", b.id, did, err)
}
}
}
@@ -120,7 +124,9 @@ func (b *Bridge) fire(did, devType, changed string, props interface{}) {
}
func deviceTypeNameRaw(d interface{}) string {
if d == nil { return "unknown" }
if d == nil {
return "unknown"
}
return deviceTypeName(d)
}
@@ -134,47 +140,47 @@ func (b *Bridge) FetchAllStates(ctx context.Context) {
switch ctrl := d.(type) {
case devices.AirConditioner:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d AC state: on=%v mode=%s target=%.1f", b.id, s.On, s.Mode, s.TargetTemperature)
logrus.Debugf("[bridge] %d AC state: on=%v mode=%s target=%.1f", b.id, s.On, s.Mode, s.TargetTemperature)
}
case devices.Light:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Light state: on=%v brightness=%d", b.id, s.On, s.Brightness)
logrus.Debugf("[bridge] %d Light state: on=%v brightness=%d", b.id, s.On, s.Brightness)
}
case devices.Switch:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Switch state: %v", b.id, s)
logrus.Debugf("[bridge] %d Switch state: %v", b.id, s)
}
case devices.Fan:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Fan state: on=%v level=%d", b.id, s.On, s.FanLevel)
logrus.Debugf("[bridge] %d Fan state: on=%v level=%d", b.id, s.On, s.FanLevel)
}
case devices.Humidifier:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Humidifier state: on=%v hum=%d", b.id, s.On, s.TargetHumidity)
logrus.Debugf("[bridge] %d Humidifier state: on=%v hum=%d", b.id, s.On, s.TargetHumidity)
}
case devices.Vacuum:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Vacuum state: on=%v mode=%d", b.id, s.On, s.Mode)
logrus.Debugf("[bridge] %d Vacuum state: on=%v mode=%d", b.id, s.On, s.Mode)
}
case devices.WaterHeater:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Heater: on=%v target=%.1f", b.id, s.On, s.TargetTemp)
logrus.Debugf("[bridge] %d Heater: on=%v target=%.1f", b.id, s.On, s.TargetTemp)
}
case devices.Cover:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Cover: pos=%d status=%d fault=%d", b.id, s.Position, s.Status, s.Fault)
logrus.Debugf("[bridge] %d Cover: pos=%d status=%d fault=%d", b.id, s.Position, s.Status, s.Fault)
}
case devices.TempHumiditySensor:
if t, h, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Sensor: temp=%.1f hum=%.1f", b.id, t, h)
logrus.Debugf("[bridge] %d Sensor: temp=%.1f hum=%.1f", b.id, t, h)
}
case devices.OccupancySensor:
if o, l, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Occupancy: occ=%v lux=%.0f", b.id, o, l)
logrus.Debugf("[bridge] %d Occupancy: occ=%v lux=%.0f", b.id, o, l)
}
case devices.Plug:
if s, err := ctrl.FetchProps(ctx); err == nil {
b.lgr.Debugf("[bridge] %d Plug state: on=%v", b.id, s.On)
logrus.Debugf("[bridge] %d Plug state: on=%v", b.id, s.On)
}
}
}