zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 17:29:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

dns checks

Browse Source
This commit is contained in:
worker-9
2021-08-06 17:48:46 -04:00
parent 7ec18afbbe
commit c5fc65ebdf
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
controllers/dnsHttpController.go
View File

@@ -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) {
@@ -244,11 +242,11 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
err = SetDNS() err = SetDNS()
if err != nil { if err != nil {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(entry) json.NewEncoder(w).Encode(entry)
} }
@@ -299,11 +297,11 @@ func updateDNS(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "badrequest")) returnErrorResponse(w, r, formatError(err, "badrequest"))
return return
} }
err = SetDNS() err = SetDNS()
if err != nil { if err != nil {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
json.NewEncoder(w).Encode(entry) json.NewEncoder(w).Encode(entry)
} }
@@ -322,11 +320,11 @@ func deleteDNS(w http.ResponseWriter, r *http.Request) {
} }
entrytext := params["domain"] + "." + params["network"] entrytext := params["domain"] + "." + params["network"]
functions.PrintUserLog("netmaker", "deleted dns entry: "+entrytext, 1) functions.PrintUserLog("netmaker", "deleted dns entry: "+entrytext, 1)
err = SetDNS() err = SetDNS()
if err != nil { if err != nil {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
json.NewEncoder(w).Encode(entrytext + " deleted.") json.NewEncoder(w).Encode(entrytext + " deleted.")
} }

1
main.go
View File

@@ -55,7 +55,6 @@ func initialize() { // Client Mode Prereq Check
log.Fatal(err) log.Fatal(err)
} }
} }
} }
func startControllers() { func startControllers() {