全面替换log为zap

This commit is contained in:
2024-11-08 18:42:13 +08:00
parent 3da1fe761e
commit edb8d30605
17 changed files with 269 additions and 55 deletions

View File

@@ -9,11 +9,12 @@ import (
"game-driver/internal/routes"
"game-driver/internal/schema"
"game-driver/leaf"
"game-driver/pkg/logger"
"game-driver/pkg/tts"
"game-driver/pkg/utils"
"github.com/eclipse/paho.golang/autopaho"
"github.com/eclipse/paho.golang/paho"
"log"
"go.uber.org/zap"
"net/url"
"os"
"os/signal"
@@ -24,12 +25,12 @@ import (
func buildMqtt(c config.MqttConfig, r *leaf.Engine, subTopics ...string) autopaho.ClientConfig {
u, err := url.Parse(c.Url)
if err != nil {
log.Panicln("mqtt url parse error: ", err)
logger.Panicln("mqtt url parse error: ", err)
}
subscriptions := make([]paho.SubscribeOptions, 0)
for _, topic := range subTopics {
log.Println("订阅主题: ", topic)
logger.Infoln("订阅主题: ", topic)
subscriptions = append(subscriptions, paho.SubscribeOptions{Topic: topic, QoS: 0})
}
@@ -39,17 +40,17 @@ func buildMqtt(c config.MqttConfig, r *leaf.Engine, subTopics ...string) autopah
CleanStartOnInitialConnection: false,
SessionExpiryInterval: 60,
OnConnectionUp: func(cm *autopaho.ConnectionManager, _ *paho.Connack) {
log.Println("MQTT 连接成功")
logger.Infoln("MQTT 连接成功")
if _, err := cm.Subscribe(context.Background(), &paho.Subscribe{
Subscriptions: subscriptions,
}); err != nil {
log.Printf("failed to subscribe (%s). This is likely to mean no messages will be received.", err)
logger.Infof("failed to subscribe (%s). This is likely to mean no messages will be received.", err)
return
}
log.Println("订阅完成")
logger.Infoln("订阅完成")
},
OnConnectError: func(err error) {
log.Printf("MQTT 连接异常: %s\n", err)
logger.Infof("MQTT 连接异常: %s\n", err)
},
ClientConfig: paho.ClientConfig{
ClientID: "TestSubscriber",
@@ -81,9 +82,11 @@ func Run() {
defer cancel()
router := leaf.Default(ctx)
log := zap.NewStdLog(logger.DefaultLogger.Zap())
router.SetDebugLogger(log)
router.DefaultHandler(func(c *leaf.Context) {
log.Printf("未处理消息 topic: %s\n payload: %s\n", c.Topic, c.Payload)
logger.Infof("未处理消息topic: %s\n payload: %s\n", c.Topic, c.Payload)
})
// 构建 MQTT 连接
@@ -92,7 +95,7 @@ func Run() {
// 连接 MQTT
cm, err := autopaho.NewConnection(ctx, mqttBuild)
if err != nil {
log.Panicln("连接 MQTT 异常: ", err)
logger.Panicln("连接 MQTT 异常: ", err)
}
// 构建语音合成对象
@@ -100,10 +103,10 @@ func Run() {
// 构建继电器对象
//r, err := relay.New(config.C.Relay, func(msg string) {
// log.Println("串口返回: ", msg)
// logger.Infoln("串口返回: ", msg)
//})
//if err != nil {
// log.Panicln("串口连接异常: ", err)
// logger.Panicln("串口连接异常: ", err)
//}
//defer r.Close()