pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志优化

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
hahwu 2026-04-28 18:31:23 +08:00
parent 087eabc12c
commit e4d5d5cef0
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/cluster/Cluster.go
View File

@ -91,18 +91,18 @@ func (a *Agent) Run() {
for {
data, err := a.conn.ReadMsg()
if err != nil {
log.Debug("read message error: %v", err)
log.Error("read message error: %v", err)
break
}
m := msg.Msg{}
err = GoUtil.GobUnmarshal(data, &m)
if err != nil {
log.Debug("decode err: %v, data: %s", err, string(data))
log.Error("decode err: %v, data: %s", err, string(data))
return
}
err = processMsg(a, &m)
if err != nil {
log.Debug("ProcessMsg err: %v", err)
log.Error("ProcessMsg err: %v", err)
}
}
}

6
src/server/cluster/cluster_func.go
View File

@ -26,7 +26,7 @@ func HandShake(a *Agent) {
}
data, err := GoUtil.GobMarshal(m)
if err != nil {
log.Debug("HandShake GobMarshal err %v", err)
log.Error("HandShake GobMarshal err %v", err)
return
}
log.Debug("握手 server id :%d", conf.Server.ServerID)
@ -147,7 +147,7 @@ func CallServerMsg(m *msg.Msg, serverId int) (*msg.Msg, error) {
defer unregisterChanel(m.UniKey)
data, err := GoUtil.GobMarshal(m)
if err != nil {
log.Debug("CallServerMsg GobMarshal err %v", err)
log.Error("CallServerMsg GobMarshal err %v", err)
return nil, err
}
v.(network.Agent).WriteMsg(data)
@ -168,7 +168,7 @@ func CallServerMsg(m *msg.Msg, serverId int) (*msg.Msg, error) {
func SendMsgAll(m *msg.Msg) {
data, err := GoUtil.GobMarshal(m)
if err != nil {
log.Debug("SendMsgAll GobMarshal err %v", err)
log.Error("SendMsgAll GobMarshal err %v", err)
return
}
serverAgent.Range(func(key, value interface{}) bool {

14
src/server/game_util/GoUtil.go
View File

@ -570,7 +570,7 @@ func GobUnmarshal(data []byte, obj interface{}) error {
decode := gob.NewDecoder(bytes.NewReader(data))
err := decode.Decode(obj)
if err != nil {
log.Debug("GobUnmarshal error: %s", err.Error())
log.Error("GobUnmarshal error: %s", err.Error())
return err
}
return nil
@ -881,7 +881,7 @@ func NotifyPlayer(uid, pushid int, title, content string) {
req, err := http.NewRequest(method, url, payload)
if err != nil {
log.Debug("notify error:", err)
log.Error("notify error:", err)
return
}
d, _ := time.ParseDuration("30m")
@ -905,14 +905,14 @@ func NotifyPlayer(uid, pushid int, title, content string) {
req.Header.Add("Content-Type", "application/json")
res, err := client.Do(req)
if err != nil {
log.Debug("notify error:", err)
log.Error("notify error:", err)
return
}
defer res.Body.Close()
body, err := io.ReadAll(res.Body)
if err != nil {
log.Debug("notify error:", err)
log.Error("notify error:", err)
return
}
log.Debug("notification send uid %d, type %d , res %s", uid, pushid, string(body))
@ -990,7 +990,7 @@ func Marshal(m thrift.TStruct) []byte {
serializer := newCompactSerializer()
data, err := serializer.Write(context.Background(), m)
if err != nil {
log.Debug("thrift Marshal error:", err)
log.Error("thrift Marshal error:", err)
return nil
}
return data
@ -1000,7 +1000,7 @@ func Unmarshal(data []byte, m thrift.TStruct) error {
deserializer := newCompactDeserializer()
err := deserializer.Read(context.Background(), m, data)
if err != nil {
log.Debug("thrift Unmarshal error:", err)
log.Error("thrift Unmarshal error:", err)
return err
}
return nil
@ -1017,7 +1017,7 @@ func JsonMarshal(v interface{}) ([]byte, error) {
func JsonUnmarshal(data []byte, v interface{}) error {
err := json.Unmarshal(data, v)
if err != nil {
log.Debug("json Unmarshal error:", err)
log.Error("json Unmarshal error:", err)
return err
}
return nil

6
src/server/gamedata/reader.go
View File

@ -66,7 +66,7 @@ func InitCfg(cfgname string) {
file, err := os.Open(absPath)
if err != nil {
log.Debug("打开文件失败:%v", err)
log.Error("打开文件失败:%v", err)
return
}
defer file.Close()
@ -74,7 +74,7 @@ func InitCfg(cfgname string) {
// 读取文件内容到字节数组
byteValue, err := io.ReadAll(file)
if err != nil {
log.Debug("读取文件失败:%v", err)
log.Error("读取文件失败:%v", err)
return
}
// 移除 BOM
@ -85,7 +85,7 @@ func InitCfg(cfgname string) {
// 反序列化JSON数据
err = json.Unmarshal(byteValue, &data)
if err != nil {
log.Debug("config name:%s,反序列化失败:%v", cfgname, err)
log.Error("config name:%s,反序列化失败:%v", cfgname, err)
return
}
// 直接使用data，无需多余拷贝