scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-01 10:57:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral-event: fix polled telemetry stream

Browse Source 
Fixes: WIFI-12341
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2023-02-20 10:35:53 +01:00
parent 9221c3e7e7
commit c55d19c3c5
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
feeds/ucentral/ucentral-event/files/ucentral-event
View File

@@ -43,7 +43,14 @@ function event(object, verb, payload) {
let type = object; let type = object;
if (verb) if (verb)
type += '.' + verb; type += '.' + verb;
if (match(object, type, config.bulk?.filter))
if (match(object, type, config.realtime?.filter))
ubus.call('ucentral', 'event', {
type,
payload
});
else if (!config.bulk?.interval || match(object, type, config.bulk?.filter))
ubus.call('ucentral', 'telemetry', { ubus.call('ucentral', 'telemetry', {
event: 'event', event: 'event',
payload: { payload: {
@@ -51,11 +58,6 @@ function event(object, verb, payload) {
payload payload
} }
}); });
else if (match(object, type, config.realtime?.filter))
ubus.call('ucentral', 'event', {
type,
payload
});
} }
let handlers = { let handlers = {
@@ -114,7 +116,7 @@ let handlers = {
function hapd_subscriber_notify_cb(notify) { function hapd_subscriber_notify_cb(notify) {
if (config.wifi?.filter == '*' || index(config.wifi?.filter || [], notify.type) > 0) { if (config.wifi?.filter == '*' || index(config.wifi?.filter || [], notify.type) >= 0) {
let payload = {}; let payload = {};
payload[notify.type] = notify.data; payload[notify.type] = notify.data;
ubus.call('ucentral', 'telemetry', { ubus.call('ucentral', 'telemetry', {
@@ -181,7 +183,7 @@ function hapd_subscriber_remove_cb(remove) {
} }
function dhcp_subscriber_notify_cb(notify) { function dhcp_subscriber_notify_cb(notify) {
if (config.dhcp?.filter == '*' || index(config.dhcp?.filter || [], notify.type) > 0) { if (config.dhcp?.filter == '*' || index(config.dhcp?.filter || [], notify.type) >= 0) {
notify.data.type = notify.type; notify.data.type = notify.type;
ubus.call('ucentral', 'telemetry', { ubus.call('ucentral', 'telemetry', {
event: 'dhcp-snooping', event: 'dhcp-snooping',