Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] Avoid sending wifi clients if there isn't any #148

Merged
merged 2 commits into from
Feb 11, 2025
Merged

[fix] Avoid sending wifi clients if there isn't any #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60e4b2a
fix Invalid data in openwisp2.log
stargieg Feb 3, 2025
6589a31
change test cases for 0 clients to nil
stargieg Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openwisp-monitoring/files/lib/openwisp-monitoring/wifi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function wifi.parse_hostapd_clients(clients)
properties.mac = mac
table.insert(data, properties)
end
return data
if #data > 0 then return data end
end

function wifi.parse_iwinfo_clients(clients)
Expand Down Expand Up @@ -62,7 +62,7 @@ function wifi.parse_iwinfo_clients(clients)
end
table.insert(data, client)
end
return data
if #data > 0 then return data end
end

-- takes ubus wireless.status clients output and converts it to NetJSON
Expand Down
4 changes: 2 additions & 2 deletions openwisp-monitoring/tests/test_wifi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function TestWifi.test_parse_hostapd_clients()
luaunit.assertEquals(wifi_functions.parse_hostapd_clients(wifi_data.wlan1_clients),
wifi_data.parsed_clients)
luaunit.assertEquals(wifi_functions.parse_hostapd_clients(wifi_data.wlan2_clients),
{})
nil)
end

function TestWifi.test_parse_iwinfo_clients()
Expand All @@ -79,7 +79,7 @@ function TestWifi.test_netjson_clients()
luaunit.assertEquals(wifi_functions.netjson_clients(wifi_data.wlan1_clients, false),
wifi_data.parsed_clients)
luaunit.assertEquals(wifi_functions.netjson_clients(wifi_data.wlan2_clients, false),
{})
nil)
-- testing iwinfo clients
luaunit.assertEquals(
wifi_functions.netjson_clients(wifi_data.mesh0_clients.results, true),
Expand Down
Loading