Browse Source

Merge pull request #1575 from gravitl/bugfix_v0.16.0_remove_log

removing log
Alex Feiszli 2 years ago
parent
commit
c86e32d930
3 changed files with 6 additions and 8 deletions
  1. 4 0
      logic/nodes.go
  2. 1 4
      netclient/functions/daemon.go
  3. 1 4
      netclient/functions/join.go

+ 4 - 0
logic/nodes.go

@@ -421,6 +421,10 @@ func SetNodeDefaults(node *models.Node) {
 
 	node.ExpirationDateTime = time.Now().Unix() + models.TEN_YEARS_IN_SECONDS
 
+	if node.DefaultACL == "" && node.IsServer != "yes" {
+		node.DefaultACL = parentNetwork.DefaultACL
+	}
+
 	if node.ListenPort == 0 {
 		node.ListenPort = parentNetwork.DefaultListenPort
 	}

+ 1 - 4
netclient/functions/daemon.go

@@ -106,10 +106,7 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
 			// == subscribe to all nodes for each on machine ==
 			serverSet[server] = true
 			logger.Log(1, "started daemon for server ", server)
-			err := local.SetNetmakerDomainRoute(cfg.Server.API)
-			if err != nil {
-				logger.Log(0, "error setting route for netmaker: "+err.Error())
-			}
+			local.SetNetmakerDomainRoute(cfg.Server.API)
 			wg.Add(1)
 			go messageQueue(ctx, wg, &cfg)
 		}

+ 1 - 4
netclient/functions/join.go

@@ -360,10 +360,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
 		logger.Log(0, "network:", node.Network, "failed to make backup, node will not auto restore if config is corrupted")
 	}
 
-	err = local.SetNetmakerDomainRoute(cfg.Server.API)
-	if err != nil {
-		logger.Log(0, "error setting route for netmaker: "+err.Error())
-	}
+	local.SetNetmakerDomainRoute(cfg.Server.API)
 	cfg.Node = node
 	if err := Register(cfg); err != nil {
 		return err