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

fixing messages and keepalive

Browse Source
This commit is contained in:
afeiszli
2022-01-31 17:21:31 -05:00
parent c6252764e8
commit 33f327f245
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netclient/functions/daemon.go
View File

@@ -321,12 +321,15 @@ func MonitorKeepalive(ctx context.Context, client mqtt.Client, cfg *config.Clien
// ServerKeepAlive -- handler to react to keepalive messages published by server // ServerKeepAlive -- handler to react to keepalive messages published by server
func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) { func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) {
var mu sync.Mutex
mu.Lock()
defer mu.Unlock()
serverid, err := getID(msg.Topic()) serverid, err := getID(msg.Topic())
if err != nil { if err != nil {
ncutils.Log("invalid ID in serverkeepalive topic") ncutils.Log("invalid ID in serverkeepalive topic")
} }
keepalive[serverid] = time.Now() keepalive[serverid] = time.Now()
ncutils.Log("keepalive from server") // ncutils.Log("keepalive from server")
} }
// Resubscribe --- handles resubscribing if needed // Resubscribe --- handles resubscribing if needed
@@ -400,7 +403,7 @@ func Checkin(ctx context.Context, cfg *config.ClientConfig, network string) {
return return
//delay should be configuraable -> use cfg.Node.NetworkSettings.DefaultCheckInInterval ?? //delay should be configuraable -> use cfg.Node.NetworkSettings.DefaultCheckInInterval ??
case <-time.After(time.Second * 60): case <-time.After(time.Second * 60):
ncutils.Log("Checkin running") // ncutils.Log("Checkin running")
//read latest config //read latest config
cfg.ReadConfig() cfg.ReadConfig()
if cfg.Node.Roaming == "yes" && cfg.Node.IsStatic != "yes" { if cfg.Node.Roaming == "yes" && cfg.Node.IsStatic != "yes" {
@@ -434,7 +437,7 @@ func Checkin(ctx context.Context, cfg *config.ClientConfig, network string) {
} }
} }
Hello(cfg, network) Hello(cfg, network)
ncutils.Log("Checkin complete") // ncutils.Log("Checkin complete")
} }
} }
} }