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

Merge pull request #980 from gravitl/feature_v0.12.2_version_update

Browse source 
update server version on start; update client version on ping
This commit is contained in:
dcarns 2022-03-28 20:01:18 -04:00 • committed by GitHub
commit ff89e3a391
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mq/handlers.go
View file

@ -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())

4
serverctl/serverctl.go
View file

@ -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(&currentServerNode, &currentServerNode)
}
if err = logic.ServerPull(&currentServerNode, true); err != nil {
logger.Log(1, "failed pull for network", network.NetID, ", on server node", currentServerNode.ID)
}