extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-26 12:42:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always initialize status recorder (#383)

Browse Source 
Always initialize the status recorder

Utilize proto methods to get pbFullStatus values.
This commit is contained in:
Maycon Santos 2022-07-07 13:54:47 +02:00 committed by GitHub
parent d4a3ee9d87
commit 7e1b20da5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
client/cmd/status.go
View File

@ -106,29 +106,32 @@ func parseFilters() error {
func fromProtoFullStatus(pbFullStatus *proto.FullStatus) nbStatus.FullStatus { func fromProtoFullStatus(pbFullStatus *proto.FullStatus) nbStatus.FullStatus {
var fullStatus nbStatus.FullStatus var fullStatus nbStatus.FullStatus
fullStatus.ManagementState.URL = pbFullStatus.ManagementState.URL managementState := pbFullStatus.GetManagementState()
fullStatus.ManagementState.Connected = pbFullStatus.ManagementState.Connected fullStatus.ManagementState.URL = managementState.GetURL()
fullStatus.ManagementState.Connected = managementState.GetConnected()
fullStatus.SignalState.URL = pbFullStatus.SignalState.URL signalState := pbFullStatus.GetSignalState()
fullStatus.SignalState.Connected = pbFullStatus.SignalState.Connected fullStatus.SignalState.URL = signalState.GetURL()
fullStatus.SignalState.Connected = signalState.GetConnected()
fullStatus.LocalPeerState.IP = pbFullStatus.LocalPeerState.IP localPeerState := pbFullStatus.GetLocalPeerState()
fullStatus.LocalPeerState.PubKey = pbFullStatus.LocalPeerState.PubKey fullStatus.LocalPeerState.IP = localPeerState.GetIP()
fullStatus.LocalPeerState.KernelInterface = pbFullStatus.LocalPeerState.KernelInterface fullStatus.LocalPeerState.PubKey = localPeerState.GetPubKey()
fullStatus.LocalPeerState.KernelInterface = localPeerState.GetKernelInterface()
var peersState []nbStatus.PeerState var peersState []nbStatus.PeerState
for _, pbPeerState := range pbFullStatus.Peers { for _, pbPeerState := range pbFullStatus.GetPeers() {
timeLocal := pbPeerState.ConnStatusUpdate.AsTime().Local() timeLocal := pbPeerState.GetConnStatusUpdate().AsTime().Local()
peerState := nbStatus.PeerState{ peerState := nbStatus.PeerState{
IP: pbPeerState.IP, IP: pbPeerState.GetIP(),
PubKey: pbPeerState.PubKey, PubKey: pbPeerState.GetPubKey(),
ConnStatus: pbPeerState.ConnStatus, ConnStatus: pbPeerState.GetConnStatus(),
ConnStatusUpdate: timeLocal, ConnStatusUpdate: timeLocal,
Relayed: pbPeerState.Relayed, Relayed: pbPeerState.GetRelayed(),
Direct: pbPeerState.Direct, Direct: pbPeerState.GetDirect(),
LocalIceCandidateType: pbPeerState.LocalIceCandidateType, LocalIceCandidateType: pbPeerState.GetLocalIceCandidateType(),
RemoteIceCandidateType: pbPeerState.RemoteIceCandidateType, RemoteIceCandidateType: pbPeerState.GetRemoteIceCandidateType(),
} }
peersState = append(peersState, peerState) peersState = append(peersState, peerState)
} }

8
client/server/server.go
View File

@ -95,7 +95,9 @@ func (s *Server) Start() error {
s.config = config s.config = config
s.statusRecorder = nbStatus.NewRecorder() if s.statusRecorder == nil {
s.statusRecorder = nbStatus.NewRecorder()
}
go func() { go func() {
if err := internal.RunClient(ctx, config, s.statusRecorder); err != nil { if err := internal.RunClient(ctx, config, s.statusRecorder); err != nil {
@ -400,6 +402,10 @@ func (s *Server) Status(
statusResponse := proto.StatusResponse{Status: string(status)} statusResponse := proto.StatusResponse{Status: string(status)}
if s.statusRecorder == nil {
s.statusRecorder = nbStatus.NewRecorder()
}
if msg.GetFullPeerStatus { if msg.GetFullPeerStatus {
fullStatus := s.statusRecorder.GetFullStatus() fullStatus := s.statusRecorder.GetFullStatus()
pbFullStatus := toProtoFullStatus(fullStatus) pbFullStatus := toProtoFullStatus(fullStatus)