Skip to content

Commit c86e32d

Browse files
authored
Merge pull request #1575 from gravitl/bugfix_v0.16.0_remove_log
removing log
2 parents b2e5e41 + def1487 commit c86e32d

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

logic/nodes.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,10 @@ func SetNodeDefaults(node *models.Node) {
421421

422422
node.ExpirationDateTime = time.Now().Unix() + models.TEN_YEARS_IN_SECONDS
423423

424+
if node.DefaultACL == "" && node.IsServer != "yes" {
425+
node.DefaultACL = parentNetwork.DefaultACL
426+
}
427+
424428
if node.ListenPort == 0 {
425429
node.ListenPort = parentNetwork.DefaultListenPort
426430
}

netclient/functions/daemon.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
106106
// == subscribe to all nodes for each on machine ==
107107
serverSet[server] = true
108108
logger.Log(1, "started daemon for server ", server)
109-
err := local.SetNetmakerDomainRoute(cfg.Server.API)
110-
if err != nil {
111-
logger.Log(0, "error setting route for netmaker: "+err.Error())
112-
}
109+
local.SetNetmakerDomainRoute(cfg.Server.API)
113110
wg.Add(1)
114111
go messageQueue(ctx, wg, &cfg)
115112
}

netclient/functions/join.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
360360
logger.Log(0, "network:", node.Network, "failed to make backup, node will not auto restore if config is corrupted")
361361
}
362362

363-
err = local.SetNetmakerDomainRoute(cfg.Server.API)
364-
if err != nil {
365-
logger.Log(0, "error setting route for netmaker: "+err.Error())
366-
}
363+
local.SetNetmakerDomainRoute(cfg.Server.API)
367364
cfg.Node = node
368365
if err := Register(cfg); err != nil {
369366
return err

0 commit comments

Comments
 (0)