chinhwajie/BitSrunLoginGo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve: pass logger instead of using global logger

Browse Source
This commit is contained in:
Mmx
2024-09-24 23:36:09 +08:00
parent e1ff68cfc2
commit 78a1b2662d
15 changed files with 163 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/eth.go
View File

@@ -13,7 +13,7 @@ type Eth struct {
}
// ConvertInterface 当没有 ipv4 地址时 eth 可能为 nil
func ConvertInterface(eth net.Interface) (*Eth, error) {
func ConvertInterface(logger *log.Logger, eth net.Interface) (*Eth, error) {
addresses, err := eth.Addrs()
if err != nil {
return nil, err
@@ -23,7 +23,7 @@ func ConvertInterface(eth net.Interface) (*Eth, error) {
var ip *net.TCPAddr
ip, err = net.ResolveTCPAddr("tcp", strings.Split(addr.String(), "/")[0]+":0")
if err != nil {
log.Warnln(eth.Name+" ip解析失败：", err)
logger.Warnln(eth.Name+" ip解析失败：", err)
continue
}
return &Eth{
@@ -35,7 +35,7 @@ func ConvertInterface(eth net.Interface) (*Eth, error) {
return nil, nil
}
func GetInterfaceAddr(regexpStr string) ([]Eth, error) {
func GetInterfaceAddr(logger *log.Logger, regexpStr string) ([]Eth, error) {
var result []Eth
interfaces, err := net.Interfaces()
@@ -44,13 +44,13 @@ func GetInterfaceAddr(regexpStr string) ([]Eth, error) {
}
reg, err := regexp.Compile(regexpStr)
if err != nil {
log.Fatalln("interfaces设置异常，无法解析: ", err)
logger.Fatalln("interfaces设置异常，无法解析: ", err)
}
for _, eth := range interfaces {
if reg.Match([]byte(eth.Name)) {
cEth, err := ConvertInterface(eth)
cEth, err := ConvertInterface(logger, eth)
if err != nil {
log.Warnln(eth.Name+" 网卡地址获取失败: ", err)
logger.Warnln(eth.Name+" 网卡地址获取失败: ", err)
continue
}
@@ -58,14 +58,14 @@ func GetInterfaceAddr(regexpStr string) ([]Eth, error) {
result = append(result, *cEth)
}
} else {
log.Debugf("网卡 %s 不匹配", eth.Name)
logger.Debugf("网卡 %s 不匹配", eth.Name)
}
}
log.Debugln("有效匹配网卡：", result)
logger.Debugln("有效匹配网卡：", result)
if len(result) == 0 {
log.Warnln("没有扫描到有效匹配网卡")
logger.Warnln("没有扫描到有效匹配网卡")
}
return result, nil