ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-09-01 16:01:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use HTTP timeout from config

Browse Source
This commit is contained in:
9seconds
2021-03-12 17:00:52 +03:00
parent 1f862027af
commit 2cc81219b1
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/base.go
+4 -3
View File
@@ -40,6 +40,7 @@ func (b *base) ReadConfig(path, version string) error {
func (b *base) makeNetwork(conf *config.Config, version string) (network.Network, error) {
tcpTimeout := conf.Network.Timeout.TCP.Value(network.DefaultTimeout)
idleTimeout := conf.Network.Timeout.Idle.Value(network.DefaultIdleTimeout)
httpTimeout := conf.Network.Timeout.HTTP.Value(network.DefaultHTTPTimeout)
dohIP := conf.Network.DOHIP.Value(net.ParseIP(network.DefaultDOHHostname)).String()
bufferSize := conf.TCPBuffer.Value(network.DefaultBufferSize)
userAgent := "mtg/" + version
@@ -59,14 +60,14 @@ func (b *base) makeNetwork(conf *config.Config, version string) (network.Network
switch len(proxyURLs) {
case 0:
return network.NewNetwork(baseDialer, userAgent, dohIP, idleTimeout)
return network.NewNetwork(baseDialer, userAgent, dohIP, httpTimeout, idleTimeout)
case 1:
socksDialer, err := network.NewSocks5Dialer(baseDialer, proxyURLs[0])
if err != nil {
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
}
return network.NewNetwork(socksDialer, userAgent, dohIP, idleTimeout)
return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout, idleTimeout)
}
socksDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, proxyURLs)
@@ -74,5 +75,5 @@ func (b *base) makeNetwork(conf *config.Config, version string) (network.Network
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
}
return network.NewNetwork(socksDialer, userAgent, dohIP, idleTimeout)
return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout, idleTimeout)
}