extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-12-04 14:03:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/test/add-stopwatch' into deploy/peer-performance

Browse Source
This commit is contained in:
bcmmbaga 2024-05-06 14:29:22 +03:00
commit 8c44187900
No known key found for this signature in database
GPG Key ID: 7249A19D20613553
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/server/peer.go
View File

@ -3,7 +3,6 @@ package server
import (
"fmt"
"net"
"runtime/debug"
"strings"
"time"
@ -290,7 +289,6 @@ func (am *DefaultAccountManager) DeletePeer(accountID, peerID, userID string) er
// GetNetworkMap returns Network map for a given peer (omits original peer from the Peers result)
func (am *DefaultAccountManager) GetNetworkMap(peerID string) (*NetworkMap, error) {
log.Debugf("GetNetworkMap with trace: %s", string(debug.Stack()))
account, err := am.Store.GetAccountByPeerID(peerID)
if err != nil {
return nil, err

29
management/server/sqlite_store.go
View File

@ -279,15 +279,11 @@ func (s *SqliteStore) GetInstallationID() string {
}
func (s *SqliteStore) SavePeerStatus(accountID, peerID string, peerStatus nbpeer.PeerStatus) error {
var peer nbpeer.Peer
result := s.db.Model(&peer).
var peerCopy nbpeer.Peer
peerCopy.Status = &peerStatus
result := s.db.Model(&nbpeer.Peer{}).
Where("account_id = ? AND id = ?", accountID, peerID).
Updates(map[string]interface{}{
"peer_status_last_seen": peerStatus.LastSeen,
"peer_status_connected": peerStatus.Connected,
"peer_status_login_expired": peerStatus.LoginExpired,
"peer_status_requires_approval": peerStatus.RequiresApproval,
})
Updates(peerCopy)
if result.Error != nil {
return result.Error
@ -301,16 +297,15 @@ func (s *SqliteStore) SavePeerStatus(accountID, peerID string, peerStatus nbpeer
}
func (s *SqliteStore) SavePeerLocation(accountID string, peerWithLocation *nbpeer.Peer) error {
location := peerWithLocation.Location
// To maintain data integrity, we create a copy of the peer's location to prevent unintended updates to other fields.
var peerCopy nbpeer.Peer
// Since the location field has been migrated to JSON serialization,
// updating the struct ensures the correct data format is inserted into the database.
peerCopy.Location = peerWithLocation.Location
var peer nbpeer.Peer
result := s.db.Model(&peer).Where("account_id = ? and id = ?", accountID, peerWithLocation.ID).
Updates(map[string]interface{}{
"location_connection_ip": location.ConnectionIP,
"location_country_code": location.CountryCode,
"location_city_name": location.CityName,
"location_geo_name_id": location.GeoNameID,
})
result := s.db.Model(&nbpeer.Peer{}).
Where("account_id = ? and id = ?", accountID, peerWithLocation.ID).
Updates(peerCopy)
if result.Error != nil {
return result.Error