improve: pass logger instead of using global logger
This commit is contained in:
@@ -10,12 +10,15 @@ import (
|
||||
)
|
||||
|
||||
func Run(c *Config) error {
|
||||
log.Infof("开始 %s DDNS 流程", c.Provider)
|
||||
|
||||
if c.Logger == nil {
|
||||
c.Logger = log.New()
|
||||
}
|
||||
if c.TTL == 0 {
|
||||
c.TTL = 600
|
||||
}
|
||||
|
||||
c.Logger.Infof("开始 %s DDNS 流程", c.Provider)
|
||||
|
||||
var dns Provider
|
||||
var err error
|
||||
switch c.Provider {
|
||||
@@ -32,22 +35,22 @@ func Run(c *Config) error {
|
||||
} else {
|
||||
msg = fmt.Sprintf("DDNS 模块 dns 运营商 %s 不支持", c.Provider)
|
||||
}
|
||||
log.Warnln(msg)
|
||||
c.Logger.Warnln(msg)
|
||||
return errors.New(msg)
|
||||
}
|
||||
if err != nil {
|
||||
log.Warnf("解析 DDNS config 失败:%v", err)
|
||||
c.Logger.Warnf("解析 DDNS config 失败:%v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
// 修改 dns 记录
|
||||
|
||||
if err = dns.SetDomainRecord(c.Domain, c.IP); err != nil {
|
||||
log.Warnf("设置 dns 解析记录失败:%v", err)
|
||||
c.Logger.Warnf("设置 dns 解析记录失败:%v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
log.Infof("DDNS 配置应用成功: %s | %s", c.Domain, c.IP)
|
||||
c.Logger.Infof("DDNS 配置应用成功: %s | %s", c.Domain, c.IP)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package dns
|
||||
|
||||
import (
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -16,4 +17,5 @@ type Config struct {
|
||||
TTL uint
|
||||
Conf config.DdnsProviderConfigSum
|
||||
Http *http.Client
|
||||
Logger *log.Logger
|
||||
}
|
||||
|
||||
56
internal/pkg/http_client/http.go
Normal file
56
internal/pkg/http_client/http.go
Normal file
@@ -0,0 +1,56 @@
|
||||
package http_client
|
||||
|
||||
import (
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config"
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config/flags"
|
||||
"github.com/Mmx233/BitSrunLoginGo/tools"
|
||||
"net"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
type Http struct {
|
||||
Client *http.Client
|
||||
}
|
||||
|
||||
var HttpPack *Http
|
||||
|
||||
var httpTools map[string]*Http
|
||||
|
||||
func init() {
|
||||
logger := config.Logger
|
||||
if config.Settings.Basic.Interfaces == "" {
|
||||
var eth *tools.Eth
|
||||
if flags.Interface != "" {
|
||||
netEth, err := net.InterfaceByName(flags.Interface)
|
||||
if err != nil {
|
||||
logger.Warnf("获取指定网卡 %s 失败,使用默认网卡: %v", flags.Interface, err)
|
||||
} else {
|
||||
eth, err = tools.ConvertInterface(logger, *netEth)
|
||||
if err != nil {
|
||||
logger.Warnf("获取指定网卡 %s ip 地址失败,使用默认网卡: %v", flags.Interface, err)
|
||||
} else if eth == nil {
|
||||
logger.Warnf("指定网卡 %s 无可用 ip 地址,使用默认网卡", flags.Interface)
|
||||
} else {
|
||||
logger.Debugf("使用指定网卡 %s ip: %s", eth.Name, eth.Addr.String())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HttpPack = genHttpPack(eth)
|
||||
} else {
|
||||
httpTools = make(map[string]*Http)
|
||||
}
|
||||
}
|
||||
|
||||
func HttpPackSelect(eth *tools.Eth) *Http {
|
||||
if HttpPack != nil {
|
||||
return HttpPack
|
||||
}
|
||||
if addrHttp, ok := httpTools[eth.Name]; ok {
|
||||
return addrHttp
|
||||
} else {
|
||||
addrHttp = genHttpPack(eth)
|
||||
httpTools[eth.Name] = addrHttp
|
||||
return addrHttp
|
||||
}
|
||||
}
|
||||
35
internal/pkg/http_client/http_default.go
Normal file
35
internal/pkg/http_client/http_default.go
Normal file
@@ -0,0 +1,35 @@
|
||||
//go:build !linux
|
||||
|
||||
package http_client
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config"
|
||||
"github.com/Mmx233/BitSrunLoginGo/tools"
|
||||
"github.com/Mmx233/tool"
|
||||
"net"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func genHttpPack(eth *tools.Eth) *Http {
|
||||
var addr net.Addr
|
||||
if eth != nil {
|
||||
addr = eth.Addr
|
||||
}
|
||||
tr := &http.Transport{
|
||||
DialContext: (&net.Dialer{
|
||||
Timeout: config.Timeout,
|
||||
LocalAddr: addr,
|
||||
}).DialContext,
|
||||
TLSClientConfig: &tls.Config{
|
||||
InsecureSkipVerify: config.Settings.Basic.SkipCertVerify,
|
||||
},
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
}
|
||||
return &Http{
|
||||
Client: tool.GenHttpClient(&tool.HttpClientOptions{
|
||||
Transport: tr,
|
||||
Timeout: config.Timeout,
|
||||
}),
|
||||
}
|
||||
}
|
||||
48
internal/pkg/http_client/http_linux.go
Normal file
48
internal/pkg/http_client/http_linux.go
Normal file
@@ -0,0 +1,48 @@
|
||||
package http_client
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config"
|
||||
"github.com/Mmx233/BitSrunLoginGo/tools"
|
||||
"github.com/Mmx233/tool"
|
||||
"net"
|
||||
"net/http"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
func genHttpPack(eth *tools.Eth) *Http {
|
||||
dialer := net.Dialer{
|
||||
Timeout: config.Timeout,
|
||||
}
|
||||
if eth != nil {
|
||||
dialer.LocalAddr = eth.Addr
|
||||
ethName := eth.Name
|
||||
dialer.Control = func(network string, address string, c syscall.RawConn) error {
|
||||
var operr error
|
||||
fn := func(fd uintptr) {
|
||||
operr = syscall.SetsockoptString(int(fd), syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, ethName)
|
||||
}
|
||||
if err := c.Control(fn); err != nil {
|
||||
return err
|
||||
}
|
||||
if operr != nil {
|
||||
return operr
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
tr := &http.Transport{
|
||||
DialContext: dialer.DialContext,
|
||||
TLSHandshakeTimeout: config.Timeout,
|
||||
IdleConnTimeout: config.Timeout,
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: config.Settings.Basic.SkipCertVerify},
|
||||
}
|
||||
tr.Proxy = http.ProxyFromEnvironment
|
||||
return &Http{
|
||||
Client: tool.GenHttpClient(&tool.HttpClientOptions{
|
||||
Transport: tr,
|
||||
Timeout: config.Timeout,
|
||||
}),
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user