TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2026-01-01 20:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: slog替换logrus、日志操作统一、支持json、text格式等

Browse Source
This commit is contained in:
meilin.huang
2023-09-02 17:24:18 +08:00
parent d51cd4b289
commit 899a3a8243
47 changed files with 685 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/pkg/utils/netx/netx.go
View File

@@ -1,7 +1,7 @@
package netx
import (
"mayfly-go/pkg/global"
"mayfly-go/pkg/logx"
"net"
"github.com/lionsoul2014/ip2region/binding/golang/xdb"
@@ -43,7 +43,7 @@ func Ip2Region(ip string) string {
vIndex, err := xdb.LoadVectorIndexFromFile(ip2RegionDbPath)
// 第一次加载失败，则默认调整为不使用ip2Region
if err != nil {
global.Log.Errorf("failed to load ip2region vector index from `%s`: %s\n", ip2RegionDbPath, err)
logx.Errorf("failed to load ip2region vector index from `%s`: %s\n", ip2RegionDbPath, err)
useIp2Region = false
return ""
}
@@ -54,7 +54,7 @@ func Ip2Region(ip string) string {
// 2、用全局的 vIndex 创建带 VectorIndex 缓存的查询对象。
searcher, err := xdb.NewWithVectorIndex(ip2RegionDbPath, vectorIndex)
if err != nil {
global.Log.Errorf("failed to create searcher with vector index: %s\n", err)
logx.Errorf("failed to create searcher with vector index: %s\n", err)
return ""
}
@@ -63,7 +63,7 @@ func Ip2Region(ip string) string {
// do the search
region, err := searcher.SearchByStr(ip)
if err != nil {
global.Log.Warnf("failed to SearchIP(%s): %s\n", ip, err)
logx.Warnf("failed to SearchIP(%s): %s\n", ip, err)
return ""
}
return region