gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-28 01:52:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #691 from gravitl/refactor_v0.10.0_daemonlog1

Browse source 
changed logging for server keepalive
This commit is contained in:
dcarns 2022-02-06 11:36:18 -05:00 committed by GitHub
commit 01b4f7d9b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
netclient/functions/daemon.go
View file

@ -371,15 +371,12 @@ func MonitorKeepalive(ctx context.Context, client mqtt.Client, cfg *config.Clien
keepaliveval, ok := keepalive.Load(cfg.Node.Network)
if ok {
keepalivetime = keepaliveval.(time.Time)
} else {
ncutils.Log("unable to parse timestamp " + keepalivetime.String())
continue
}
if time.Since(keepalivetime) > time.Second*120 { // more than 2+ minutes
ncutils.Log("server keepalive not recieved recently, resubscribe to message queue")
err := Resubscribe(client, cfg)
if err != nil {
ncutils.Log("closing " + err.Error())
if !keepalivetime.IsZero() && time.Since(keepalivetime) > time.Second*120 { // more than 2+ minutes
ncutils.Log("server keepalive not recieved recently, resubscribe to message queue")
err := Resubscribe(client, cfg)
if err != nil {
ncutils.Log("closing " + err.Error())
}
}
}
}
@ -390,7 +387,7 @@ func MonitorKeepalive(ctx context.Context, client mqtt.Client, cfg *config.Clien
func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) {
var currentTime = time.Now()
keepalive.Store(parseNetworkFromTopic(msg.Topic()), currentTime)
ncutils.PrintLog("setting time: "+currentTime.String(), 1)
ncutils.PrintLog("received server keepalive at "+currentTime.String(), 2)
}
// Resubscribe --- handles resubscribing if needed
@ -538,6 +535,8 @@ func Hello(cfg *config.ClientConfig, network string) {
}
}
// == Private ==
func publish(cfg *config.ClientConfig, dest string, msg []byte) error {
// setup the keys
trafficPrivKey, err := auth.RetrieveTrafficKey(cfg.Node.Network)