From 52a14877ff5614d2181f897f547ae7172ee185b8 Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Mon, 28 Mar 2022 17:26:03 -0400 Subject: [PATCH] update versions Signed-off-by: Matthew R. Kasun --- mq/handlers.go | 4 +++- serverctl/serverctl.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mq/handlers.go b/mq/handlers.go index aa24e904..136f738c 100644 --- a/mq/handlers.go +++ b/mq/handlers.go @@ -36,16 +36,18 @@ func Ping(client mqtt.Client, msg mqtt.Message) { logger.Log(0, record) return } - _, decryptErr := decryptMsg(&node, msg.Payload()) + version, decryptErr := decryptMsg(&node, msg.Payload()) if decryptErr != nil { logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error()) return } node.SetLastCheckIn() + node.Version = string(version) if err := logic.UpdateNode(&node, &node); err != nil { logger.Log(0, "error updating node", node.Name, node.ID, " on checkin", err.Error()) return } + logger.Log(3, "ping processed for node", node.ID) // --TODO --set client version once feature is implemented. //node.SetClientVersion(msg.Payload()) diff --git a/serverctl/serverctl.go b/serverctl/serverctl.go index 07d01f35..c0de6ffa 100644 --- a/serverctl/serverctl.go +++ b/serverctl/serverctl.go @@ -100,6 +100,10 @@ func InitServerNetclient() error { for _, network := range networks { var currentServerNode, nodeErr = logic.GetNetworkServerLocal(network.NetID) if nodeErr == nil { + if currentServerNode.Version != servercfg.Version { + currentServerNode.Version = servercfg.Version + logic.UpdateNode(¤tServerNode, ¤tServerNode) + } if err = logic.ServerPull(¤tServerNode, true); err != nil { logger.Log(1, "failed pull for network", network.NetID, ", on server node", currentServerNode.ID) }