sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-16 15:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix nil pointer for context

Browse Source 
- fix development version handling
- add log lines
This commit is contained in:
Zoltán Papp
2025-10-13 22:10:09 +02:00
parent 1354096c4d
commit 18f884f769
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/internal/connect.go
View File

@@ -272,9 +272,6 @@ func (c *ConnectClient) run(mobileDependency MobileDependency, runningChan chan
c.engineMutex.Lock()
c.engine = NewEngine(engineCtx, cancel, signalClient, mgmClient, relayManager, engineConfig, mobileDependency, c.statusRecorder, checks)
if loginResp.PeerConfig != nil && loginResp.PeerConfig.AutoUpdate != nil {
c.engine.InitialUpdateHandling(loginResp.PeerConfig.AutoUpdate)
}
c.engine.SetSyncResponsePersistence(c.persistSyncResponse)
c.engineMutex.Unlock()
@@ -283,6 +280,10 @@ func (c *ConnectClient) run(mobileDependency MobileDependency, runningChan chan
return wrapErr(err)
}
if loginResp.PeerConfig != nil && loginResp.PeerConfig.AutoUpdate != nil {
c.engine.InitialUpdateHandling(loginResp.PeerConfig.AutoUpdate)
}
log.Infof("Netbird engine started, the IP is: %s", peerConfig.GetAddress())
state.Set(StatusConnected)

23
client/internal/updatemanager/manager.go
View File

@@ -23,6 +23,8 @@ import (
const (
latestVersion = "latest"
// this version will be ignored
developmentVersion = "development"
)
type UpdateInterface interface {
@@ -100,6 +102,7 @@ func (u *UpdateManager) Start(ctx context.Context) {
}
func (u *UpdateManager) SetVersion(expectedVersion string) {
log.Infof("set expected agent version for upgrade: %s", expectedVersion)
if u.cancel == nil {
log.Errorf("UpdateManager not started")
return
@@ -168,6 +171,7 @@ func (u *UpdateManager) updateLoop(ctx context.Context) {
return
case <-u.mgmUpdateChan:
case <-u.updateChannel:
log.Infof("fetched new version info")
}
u.handleUpdate(ctx)
@@ -192,7 +196,7 @@ func (u *UpdateManager) handleUpdate(ctx context.Context) {
// Resolve "latest" to actual version
case useLatest:
if curLatestVersion == nil {
log.Tracef("Latest version not fetched yet")
log.Tracef("latest version not fetched yet")
return
}
updateVersion = curLatestVersion
@@ -200,10 +204,11 @@ func (u *UpdateManager) handleUpdate(ctx context.Context) {
case expectedVersion != nil:
updateVersion = expectedVersion
default:
log.Debugf("No expected version information set")
log.Debugf("no expected version information set")
return
}
log.Debugf("checking update option, current version: %s, target version: %s", u.currentVersion, updateVersion)
if !u.shouldUpdate(updateVersion) {
return
}
@@ -262,7 +267,7 @@ func (u *UpdateManager) handleUpdate(ctx context.Context) {
}
func (u *UpdateManager) updateStateManager(ctx context.Context) {
var stateType *UpdateState
stateType := &UpdateState{}
u.stateManager.RegisterState(stateType)
if err := u.stateManager.LoadState(stateType); err != nil {
@@ -298,18 +303,22 @@ func (u *UpdateManager) updateStateManager(ctx context.Context) {
}
func (u *UpdateManager) shouldUpdate(updateVersion *v.Version) bool {
if u.currentVersion == developmentVersion {
log.Debugf("skipping auto-update, running development version")
return false
}
currentVersion, err := v.NewVersion(u.currentVersion)
if err != nil {
log.Errorf("Error checking for update, error parsing version `%s`: %v", u.currentVersion, err)
log.Errorf("error checking for update, error parsing version `%s`: %v", u.currentVersion, err)
return false
}
if currentVersion.GreaterThanOrEqual(updateVersion) {
log.Debugf("Current version (%s) is equal to or higher than auto-update version (%s)", u.currentVersion, updateVersion)
log.Infof("current version (%s) is equal to or higher than auto-update version (%s)", u.currentVersion, updateVersion)
return false
}
if time.Since(u.lastTrigger) < 5*time.Minute {
log.Tracef("No need to update")
log.Debugf("skipping auto-update, last update was %s ago", time.Since(u.lastTrigger))
return false
}
@@ -367,7 +376,7 @@ func downloadFileToTemporaryDir(ctx context.Context, fileURL string) (string, er
return "", fmt.Errorf("error downloading file: %w", err)
}
log.Debugf("downloaded update file to %s", out.Name())
log.Infof("downloaded update file to %s", out.Name())
success = true // Mark success to prevent cleanup
return out.Name(), nil