dandri/beacon-server
1
0 Fork 0
mirror of https://github.com/MeshCore-Beacon/beacon-server.git synced 2026-10-23 12:12:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ingest): use last seen in observer online check

Browse Source 
now uses last seen (packet message) as well as last
status (status message) as indicators of observer
being online or not
This commit is contained in:
Enot (ded) Skelly committed 2026-06-16 09:00:06 -07:00
1 parent f67fc3be0d
commit b4152e0e5f
4 files changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

db/observers.go
+2 -1
View File
@@ -140,7 +140,8 @@ func (s *Store) GetObserver(ctx context.Context, observerID uuid.UUID) (*api.Obs
})
}
observer.Brokers = brokers
if obs.LastStatusAt.Valid && time.Since(obs.LastStatusAt.Time) < 5*time.Minute {
if (obs.LastStatusAt.Valid && time.Since(obs.LastStatusAt.Time) < 5*time.Minute) ||
(obs.LastSeen.Valid && time.Since(obs.LastSeen.Time) < 5*time.Minute) {
observer.Status = "online"
}
var lastStatusAt *int64
db/observers_test.go
+2 -2
View File
@@ -184,7 +184,7 @@ func TestGetObserver_OnlineStatus(t *testing.T) {
PublicKey: []byte{0x01},
ObservationCount: &obsCount,
FirstSeen: pgtype.Timestamptz{Time: time.Now().Add(-time.Hour), Valid: true},
LastSeen: pgtype.Timestamptz{Time: time.Now(), Valid: true},
LastSeen: pgtype.Timestamptz{Time: time.Now().Add(-time.Minute), Valid: true},
LastStatusAt: pgtype.Timestamptz{Time: time.Now().Add(-time.Minute), Valid: true},
}, nil)
@@ -227,7 +227,7 @@ func TestGetObserver_OfflineStatus(t *testing.T) {
PublicKey: []byte{0x01},
ObservationCount: &obsCount,
FirstSeen: pgtype.Timestamptz{Time: time.Now().Add(-time.Hour), Valid: true},
LastSeen: pgtype.Timestamptz{Time: time.Now(), Valid: true},
LastSeen: pgtype.Timestamptz{Time: time.Now().Add(-10 * time.Minute), Valid: true},
LastStatusAt: pgtype.Timestamptz{Time: time.Now().Add(-10 * time.Minute), Valid: true},
}, nil)
db/queries/queries.sql
+2 -2
View File
@@ -146,7 +146,7 @@ SELECT
o.radio_bw_khz,
array_remove(array_agg(DISTINCT ts.name ORDER BY ts.name), NULL)::text[] AS scopes,
COALESCE(CASE
WHEN o.last_status_at > NOW() - INTERVAL '5 minutes' THEN 'online'
WHEN GREATEST(COALESCE(o.last_status_at, o.last_seen), o.last_seen) > NOW() - INTERVAL '5 minutes' THEN 'online'
ELSE 'offline'
END, 'offline')::text AS status,
COALESCE((
@@ -169,7 +169,7 @@ WHERE
AND ($2 = '' OR o.observer_type = $2)
AND ($3 = '' OR ob.broker_name = $3)
AND ($4 = '' OR CASE
WHEN o.last_status_at > NOW() - INTERVAL '5 minutes' THEN 'online'
WHEN GREATEST(COALESCE(o.last_status_at, o.last_seen), o.last_seen) > NOW() - INTERVAL '5 minutes' THEN 'online'
ELSE 'offline'
END = $4)
AND ($5 = '' OR o.display_name ILIKE '%' || $5 || '%')
db/sqlc/queries.sql.go
+2 -2
View File
@@ -2279,7 +2279,7 @@ SELECT
o.radio_bw_khz,
array_remove(array_agg(DISTINCT ts.name ORDER BY ts.name), NULL)::text[] AS scopes,
COALESCE(CASE
WHEN o.last_status_at > NOW() - INTERVAL '5 minutes' THEN 'online'
WHEN GREATEST(COALESCE(o.last_status_at, o.last_seen), o.last_seen) > NOW() - INTERVAL '5 minutes' THEN 'online'
ELSE 'offline'
END, 'offline')::text AS status,
COALESCE((
@@ -2302,7 +2302,7 @@ WHERE
AND ($2 = '' OR o.observer_type = $2)
AND ($3 = '' OR ob.broker_name = $3)
AND ($4 = '' OR CASE
WHEN o.last_status_at > NOW() - INTERVAL '5 minutes' THEN 'online'
WHEN GREATEST(COALESCE(o.last_status_at, o.last_seen), o.last_seen) > NOW() - INTERVAL '5 minutes' THEN 'online'
ELSE 'offline'
END = $4)
AND ($5 = '' OR o.display_name ILIKE '%' || $5 || '%')