vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-12 13:11:47 -07:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

PLG: Centralize SQL condition to skip forced-online devices in event inserts

Browse Source
This commit is contained in:
Jokob @NetAlertX
2026-04-10 22:13:09 +00:00
parent 50be56c8bb
commit c80dc9c36a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/scan/session_events.py
View File

@@ -20,6 +20,10 @@ from messaging.reporting import skip_repeated_notifications
from messaging.in_app import update_unread_notifications_count from messaging.in_app import update_unread_notifications_count
from const import NULL_EQUIVALENTS_SQL from const import NULL_EQUIVALENTS_SQL
# Predicate used in every negative-event INSERT to skip forced-online devices.
# Centralised here so all three event paths stay in sync.
_SQL_NOT_FORCED_ONLINE = "LOWER(COALESCE(devForceStatus, '')) != 'online'"
# Make sure log level is initialized correctly # Make sure log level is initialized correctly
Logger(get_setting_value("LOG_LEVEL")) Logger(get_setting_value("LOG_LEVEL"))
@@ -179,7 +183,7 @@ def insert_events(db):
WHERE devAlertDown != 0 WHERE devAlertDown != 0
AND devCanSleep = 0 AND devCanSleep = 0
AND devPresentLastScan = 1 AND devPresentLastScan = 1
AND LOWER(COALESCE(devForceStatus, '')) != 'online' AND {_SQL_NOT_FORCED_ONLINE}
AND NOT EXISTS (SELECT 1 FROM CurrentScan AND NOT EXISTS (SELECT 1 FROM CurrentScan
WHERE devMac = scanMac WHERE devMac = scanMac
) """) ) """)
@@ -195,7 +199,7 @@ def insert_events(db):
AND devCanSleep = 1 AND devCanSleep = 1
AND devIsSleeping = 0 AND devIsSleeping = 0
AND devPresentLastScan = 0 AND devPresentLastScan = 0
AND LOWER(COALESCE(devForceStatus, '')) != 'online' AND {_SQL_NOT_FORCED_ONLINE}
AND NOT EXISTS (SELECT 1 FROM CurrentScan AND NOT EXISTS (SELECT 1 FROM CurrentScan
WHERE devMac = scanMac) WHERE devMac = scanMac)
AND NOT EXISTS (SELECT 1 FROM Events AND NOT EXISTS (SELECT 1 FROM Events
@@ -231,7 +235,7 @@ def insert_events(db):
FROM Devices FROM Devices
WHERE devAlertDown = 0 WHERE devAlertDown = 0
AND devPresentLastScan = 1 AND devPresentLastScan = 1
AND LOWER(COALESCE(devForceStatus, '')) != 'online' AND {_SQL_NOT_FORCED_ONLINE}
AND NOT EXISTS (SELECT 1 FROM CurrentScan AND NOT EXISTS (SELECT 1 FROM CurrentScan
WHERE devMac = scanMac WHERE devMac = scanMac
) """) ) """)