Commit 7174fdc8 authored by Frank Denis's avatar Frank Denis

Do not always override the netprobe_timeout option from config file

Fixes #641
parent 56f69d22
......@@ -406,9 +406,11 @@ func ConfigLoad(proxy *Proxy, svcFlag *string) error {
}
netprobeTimeout := config.NetprobeTimeout
if netprobeTimeoutOverride != nil {
netprobeTimeout = *netprobeTimeoutOverride
}
flag.Visit(func(flag *flag.Flag) {
if flag.Name == "netprobe-timeout" && netprobeTimeoutOverride != nil {
netprobeTimeout = *netprobeTimeoutOverride
}
})
netProbe(config.NetprobeAddress, netprobeTimeout)
if !config.OfflineMode {
if err := config.loadSources(proxy); err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment