mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-06 17:29:15 +08:00
dns checks
This commit is contained in:
@@ -3,8 +3,9 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
|
||||||
"log"
|
"log"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
"github.com/go-playground/validator/v10"
|
"github.com/go-playground/validator/v10"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gravitl/netmaker/database"
|
"github.com/gravitl/netmaker/database"
|
||||||
@@ -148,14 +149,11 @@ func SetDNS() error {
|
|||||||
for _, net := range networks {
|
for _, net := range networks {
|
||||||
corefilestring = corefilestring + net.NetID + " "
|
corefilestring = corefilestring + net.NetID + " "
|
||||||
dns, err := GetDNS(net.NetID)
|
dns, err := GetDNS(net.NetID)
|
||||||
if err != nil {
|
if err != nil && !database.IsEmptyRecord(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for _, entry := range dns {
|
for _, entry := range dns {
|
||||||
hostfile.AddHost(entry.Address, entry.Name+"."+entry.Network)
|
hostfile.AddHost(entry.Address, entry.Name+"."+entry.Network)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if corefilestring == "" {
|
if corefilestring == "" {
|
||||||
@@ -211,16 +209,16 @@ func GetDNS(network string) ([]models.DNSEntry, error) {
|
|||||||
|
|
||||||
var dns []models.DNSEntry
|
var dns []models.DNSEntry
|
||||||
dns, err := GetNodeDNS(network)
|
dns, err := GetNodeDNS(network)
|
||||||
if err != nil {
|
if err != nil && !database.IsEmptyRecord(err) {
|
||||||
return dns, err
|
return dns, err
|
||||||
}
|
}
|
||||||
customdns, err := GetCustomDNS(network)
|
customdns, err := GetCustomDNS(network)
|
||||||
if err != nil {
|
if err != nil && !database.IsEmptyRecord(err) {
|
||||||
return dns, err
|
return dns, err
|
||||||
}
|
}
|
||||||
|
|
||||||
dns = append(dns, customdns...)
|
dns = append(dns, customdns...)
|
||||||
return dns, err
|
return dns, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createDNS(w http.ResponseWriter, r *http.Request) {
|
func createDNS(w http.ResponseWriter, r *http.Request) {
|
||||||
|
Reference in New Issue
Block a user