mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-02-03 22:18:39 +00:00
Fix wrong timeout in lookupIP
The assignment is changed wrongly in process of refactoring parallel dialer for resolving bootstrap IP. While at it, also satisfy staticheck for jffs not enabled error.
This commit is contained in:
committed by
Cuong Manh Le
parent
9689607409
commit
fa14f1dadf
@@ -12,7 +12,8 @@ const (
|
||||
nvramRCStartupKey = "rc_startup"
|
||||
)
|
||||
|
||||
var ddwrtJffs2NotEnabledErr = errors.New(`could not install service without jffs, follow this guide to enable:
|
||||
// lint:ignore ST1005 This error is for human.
|
||||
var errDdwrtJffs2NotEnabled = errors.New(`could not install service without jffs, follow this guide to enable:
|
||||
|
||||
https://wiki.dd-wrt.com/wiki/index.php/Journalling_Flash_File_System
|
||||
`)
|
||||
|
||||
@@ -84,7 +84,7 @@ func ConfigureService(sc *service.Config) error {
|
||||
switch name {
|
||||
case DDWrt:
|
||||
if !ddwrtJff2Enabled() {
|
||||
return ddwrtJffs2NotEnabledErr
|
||||
return errDdwrtJffs2NotEnabled
|
||||
}
|
||||
case OpenWrt:
|
||||
sc.Option["SysvScript"] = openWrtScript
|
||||
|
||||
@@ -143,7 +143,7 @@ func lookupIP(domain string, timeout int, withBootstrapDNS bool) (ips []string)
|
||||
ProxyLog.Debug().Msgf("Resolving %q using bootstrap DNS %q", domain, resolver.nameservers)
|
||||
timeoutMs := 2000
|
||||
if timeout > 0 && timeout < timeoutMs {
|
||||
timeoutMs = timeoutMs
|
||||
timeoutMs = timeout
|
||||
}
|
||||
questionDomain := dns.Fqdn(domain)
|
||||
ipFromRecord := func(record dns.RR) string {
|
||||
|
||||
Reference in New Issue
Block a user