extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-09 15:25:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Ensure status recorder is always initialized (#3588)

Browse Source 
* Ensure status recorder is always initialized

* Add test

* Add subscribe test
This commit is contained in:
Viktor Liu
2025-03-27 22:48:11 +01:00
committed by GitHub
parent a4f04f5570
commit 101cce27f2
2 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/server/server.go
View File

@ -84,6 +84,7 @@ func New(ctx context.Context, configPath, logFile string) *Server {
},
logFile: logFile,
persistNetworkMap: true,
statusRecorder: peer.NewRecorder(""),
}
}
@ -136,9 +137,6 @@ func (s *Server) Start() error {
s.config = config
if s.statusRecorder == nil {
s.statusRecorder = peer.NewRecorder(config.ManagementURL.String())
}
s.statusRecorder.UpdateManagementAddress(config.ManagementURL.String())
s.statusRecorder.UpdateRosenpass(config.RosenpassEnabled, config.RosenpassPermissive)
@ -622,9 +620,6 @@ func (s *Server) Up(callerCtx context.Context, _ *proto.UpRequest) (*proto.UpRes
return nil, fmt.Errorf("config is not defined, please call login command first")
}
if s.statusRecorder == nil {
s.statusRecorder = peer.NewRecorder(s.config.ManagementURL.String())
}
s.statusRecorder.UpdateManagementAddress(s.config.ManagementURL.String())
s.statusRecorder.UpdateRosenpass(s.config.RosenpassEnabled, s.config.RosenpassPermissive)
@ -692,9 +687,6 @@ func (s *Server) Status(
statusResponse := proto.StatusResponse{Status: string(status), DaemonVersion: version.NetbirdVersion()}
if s.statusRecorder == nil {
s.statusRecorder = peer.NewRecorder(s.config.ManagementURL.String())
}
s.statusRecorder.UpdateManagementAddress(s.config.ManagementURL.String())
s.statusRecorder.UpdateRosenpass(s.config.RosenpassEnabled, s.config.RosenpassPermissive)