tyler
/
armbian-router
1
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Fix config loading issue when servers don't resolve

This commit is contained in:
Tyler 2022-08-18 23:42:54 -04:00
parent 4d7c836810
commit d22b87da10
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config.go
View File

@ -197,7 +197,12 @@ func (r *Redirector) reloadServers() error {
go func(i int, server ServerConfig, u *url.URL) { go func(i int, server ServerConfig, u *url.URL) {
defer wg.Done() defer wg.Done()
s := r.addServer(server, u) s, err := r.addServer(server, u)
if err != nil {
log.WithError(err).Warning("Unable to add server")
return
}
if _, ok := existing[u.Host]; ok { if _, ok := existing[u.Host]; ok {
s.Redirects = r.servers[i].Redirects s.Redirects = r.servers[i].Redirects
@ -243,7 +248,7 @@ var metricReplacer = strings.NewReplacer(".", "_", "-", "_")
// addServer takes ServerConfig and constructs a server. // addServer takes ServerConfig and constructs a server.
// This will create duplicate servers, but it will overwrite existing ones when changed. // This will create duplicate servers, but it will overwrite existing ones when changed.
func (r *Redirector) addServer(server ServerConfig, u *url.URL) *Server { func (r *Redirector) addServer(server ServerConfig, u *url.URL) (*Server, error) {
s := &Server{ s := &Server{
Available: true, Available: true,
Host: u.Host, Host: u.Host,
@ -275,7 +280,7 @@ func (r *Redirector) addServer(server ServerConfig, u *url.URL) *Server {
"error": err, "error": err,
"server": s.Host, "server": s.Host,
}).Warning("Could not resolve address") }).Warning("Could not resolve address")
return nil return nil, err
} }
var city City var city City
@ -287,7 +292,7 @@ func (r *Redirector) addServer(server ServerConfig, u *url.URL) *Server {
"server": s.Host, "server": s.Host,
"ip": ips[0], "ip": ips[0],
}).Warning("Could not geolocate address") }).Warning("Could not geolocate address")
return nil return nil, err
} }
if s.Continent == "" { if s.Continent == "" {
@ -299,7 +304,7 @@ func (r *Redirector) addServer(server ServerConfig, u *url.URL) *Server {
s.Longitude = city.Location.Longitude s.Longitude = city.Location.Longitude
} }
return s return s, nil
} }
func (r *Redirector) reloadMap() error { func (r *Redirector) reloadMap() error {