gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-14 09:04:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

modify syncservernetwork

Browse source
This commit is contained in:
afeiszli 2022-02-01 09:59:23 -05:00
parent a182d7f4ed
commit 294654d950
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.go
View file

@ -39,6 +39,10 @@ func main() {
func initialize() { // Client Mode Prereq Check func initialize() { // Client Mode Prereq Check
var err error var err error
if servercfg.GetNodeID() == "" {
logger.FatalLog("error: must set NODE_ID, currently blank")
}
if err = database.InitializeDatabase(); err != nil { if err = database.InitializeDatabase(); err != nil {
logger.FatalLog("Error connecting to database") logger.FatalLog("Error connecting to database")
} }

2
servercfg/serverconf.go
View file

@ -538,7 +538,7 @@ func IsHostNetwork() bool {
// GetNodeID - gets the node id // GetNodeID - gets the node id
func GetNodeID() string { func GetNodeID() string {
var id string var id string
id = getMacAddr() // id = getMacAddr()
if os.Getenv("NODE_ID") != "" { if os.Getenv("NODE_ID") != "" {
id = os.Getenv("NODE_ID") id = os.Getenv("NODE_ID")
} else if config.Config.Server.NodeID != "" { } else if config.Config.Server.NodeID != "" {

16
serverctl/serverctl.go
View file

@ -36,14 +36,22 @@ func SyncServerNetwork(network string) error {
if err != nil { if err != nil {
return err return err
} }
exists := false
ifaceExists := false
for _, localnet := range localnets { for _, localnet := range localnets {
if serverNetworkSettings.DefaultInterface == localnet.Name { if serverNetworkSettings.DefaultInterface == localnet.Name {
exists = true ifaceExists = true
} }
} }
// add networks locally that exist in database
if !exists { serverNodeID, err := logic.GetNetworkServerNodeID(network)
if !ifaceExists && (err == nil && serverNodeID != "") {
serverNode, err := logic.GetNodeByID(serverNodeID)
if err != nil {
return err
}
return logic.ServerUpdate(&serverNode, true)
} else if !ifaceExists {
err := logic.ServerJoin(&serverNetworkSettings) err := logic.ServerJoin(&serverNetworkSettings)
if err != nil { if err != nil {
if err == nil { if err == nil {