zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-01 04:32:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

dns on for nodes

Browse Source
This commit is contained in:
worker-9
2021-08-10 13:47:36 -04:00
parent 47fe905438
commit f5f06f9f8f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/common.go
View File

@@ -5,6 +5,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/database"
"github.com/gravitl/netmaker/functions" "github.com/gravitl/netmaker/functions"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
@@ -21,19 +22,19 @@ func GetPeersList(networkName string) ([]models.Node, error) {
if database.IsEmptyRecord(err) { if database.IsEmptyRecord(err) {
return peers, nil return peers, nil
} }
functions.PrintUserLog("",err.Error(),2) functions.PrintUserLog("", err.Error(), 2)
return nil, err return nil, err
} }
udppeers, errN := database.GetPeers(networkName) udppeers, errN := database.GetPeers(networkName)
if errN != nil { if errN != nil {
functions.PrintUserLog("",errN.Error(),2) functions.PrintUserLog("", errN.Error(), 2)
} }
for _, value := range collection { for _, value := range collection {
var node models.Node var node models.Node
var peer models.Node var peer models.Node
err := json.Unmarshal([]byte(value), &node) err := json.Unmarshal([]byte(value), &node)
if err != nil { if err != nil {
functions.PrintUserLog("",err.Error(),2) functions.PrintUserLog("", err.Error(), 2)
continue continue
} }
if node.IsEgressGateway == "yes" { // handle egress stuff if node.IsEgressGateway == "yes" { // handle egress stuff
@@ -122,7 +123,7 @@ func DeleteNode(key string, exterminate bool) error {
} }
} else { } else {
if err := database.DeleteRecord(database.DELETED_NODES_TABLE_NAME, key); err != nil { if err := database.DeleteRecord(database.DELETED_NODES_TABLE_NAME, key); err != nil {
functions.PrintUserLog("",err.Error(),2) functions.PrintUserLog("", err.Error(), 2)
} }
} }
if err := database.DeleteRecord(database.NODES_TABLE_NAME, key); err != nil { if err := database.DeleteRecord(database.NODES_TABLE_NAME, key); err != nil {
@@ -214,6 +215,9 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
//returnErrorResponse(w, r, errorResponse) //returnErrorResponse(w, r, errorResponse)
return node, err return node, err
} }
if servercfg.IsDNSMode() {
node.DNSOn = "yes"
}
err = node.Validate(false) err = node.Validate(false)
if err != nil { if err != nil {
return node, err return node, err
@@ -243,11 +247,11 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
func SetNetworkServerPeers(networkName string) { func SetNetworkServerPeers(networkName string) {
if currentPeersList, err := serverctl.GetPeers(networkName); err == nil { if currentPeersList, err := serverctl.GetPeers(networkName); err == nil {
if database.SetPeers(currentPeersList, networkName) { if database.SetPeers(currentPeersList, networkName) {
functions.PrintUserLog(models.NODE_SERVER_NAME,"set new peers on network "+networkName,1) functions.PrintUserLog(models.NODE_SERVER_NAME, "set new peers on network "+networkName, 1)
} }
} else { } else {
functions.PrintUserLog(models.NODE_SERVER_NAME,"could not set peers on network "+networkName,1) functions.PrintUserLog(models.NODE_SERVER_NAME, "could not set peers on network "+networkName, 1)
functions.PrintUserLog(models.NODE_SERVER_NAME,err.Error(),1) functions.PrintUserLog(models.NODE_SERVER_NAME, err.Error(), 1)
} }
} }