Skip to content

Commit e641709

Browse files
committed
fix: is_list_ignored=false filters for network and temperature
Use filter logic from network/sysinfo in temperature and network/heim harvesters. Previously is_list_ignored=false filter configs would silently accept every sensor and every interface.
1 parent 7008f1d commit e641709

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

src/app/data_harvester/network/heim.rs

+6-11
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,17 @@ pub async fn get_network_data(
2323
while let Some(io) = io_data.next().await {
2424
if let Ok(io) = io {
2525
let to_keep = if let Some(filter) = filter {
26-
if filter.is_list_ignored {
27-
let mut ret = true;
28-
for r in &filter.list {
29-
if r.is_match(io.interface()) {
30-
ret = false;
31-
break;
32-
}
26+
let mut ret = filter.is_list_ignored;
27+
for r in &filter.list {
28+
if r.is_match(io.interface()) {
29+
ret = !filter.is_list_ignored;
30+
break;
3331
}
34-
ret
35-
} else {
36-
true
3732
}
33+
ret
3834
} else {
3935
true
4036
};
41-
4237
if to_keep {
4338
// TODO: Use bytes as the default instead, perhaps?
4439
// Since you might have to do a double conversion (bytes -> bits -> bytes) in some cases;

src/app/data_harvester/temperature.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,14 @@ fn convert_celsius_to_fahrenheit(celsius: f32) -> f32 {
4747

4848
fn is_temp_filtered(filter: &Option<Filter>, text: &str) -> bool {
4949
if let Some(filter) = filter {
50-
if filter.is_list_ignored {
51-
let mut ret = true;
52-
for r in &filter.list {
53-
if r.is_match(text) {
54-
ret = false;
55-
break;
56-
}
50+
let mut ret = filter.is_list_ignored;
51+
for r in &filter.list {
52+
if r.is_match(text) {
53+
ret = !filter.is_list_ignored;
54+
break;
5755
}
58-
ret
59-
} else {
60-
true
6156
}
57+
ret
6258
} else {
6359
true
6460
}

0 commit comments

Comments
 (0)