ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-02-21 01:21:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Return with abort instead of error.

Browse Source 
This is not an operational error, we are already logging the message as
warn, which is more appropriate as it is caused by user-input.
This commit is contained in:
Orne Brocaar 2024-09-19 11:28:46 +01:00
parent 3b42b9ffdb
commit 07364fb05d
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chirpstack/src/downlink/error.rs
View File

@ -7,4 +7,7 @@ pub enum Error {
#[error(transparent)]
AnyhowError(#[from] anyhow::Error),
#[error(transparent)]
StorageError(#[from] crate::storage::error::Error),
}

24
chirpstack/src/downlink/multicast.rs
View File

@ -8,7 +8,7 @@ use petgraph::graph::{DefaultIx, Graph, NodeIndex, UnGraph};
use rand::Rng;
use tracing::{span, trace, warn, Instrument, Level};
use crate::downlink::helpers;
use crate::downlink::{error::Error, helpers};
use crate::gateway::backend as gateway_backend;
use crate::storage::{device_gateway, downlink_frame, gateway, multicast};
use crate::{config, region};
@ -33,9 +33,19 @@ impl Multicast {
pub async fn handle_schedule_queue_item(qi: multicast::MulticastGroupQueueItem) -> Result<()> {
let span = span!(Level::INFO, "multicast", multicast_group_id = %qi.multicast_group_id, gateway_id = %qi.gateway_id);
Multicast::_handle_schedule_queue_item(qi)
match Multicast::_handle_schedule_queue_item(qi)
.instrument(span)
.await
{
Ok(()) => Ok(()),
Err(e) => match e.downcast_ref::<Error>() {
Some(Error::Abort) => {
// Nothing to do
Ok(())
}
_ => Err(e),
},
}
}
async fn _handle_schedule_queue_item(qi: multicast::MulticastGroupQueueItem) -> Result<()> {
@ -92,7 +102,7 @@ impl Multicast {
Ok(())
}
async fn validate_expiration(&self) -> Result<()> {
async fn validate_expiration(&self) -> Result<(), Error> {
trace!("Validating expires_at");
if let Some(expires_at) = self.multicast_group_queue_item.expires_at {
if Utc::now() > expires_at {
@ -101,14 +111,14 @@ impl Multicast {
"Discarding multicast-group queue item because it has expired"
);
multicast::delete_queue_item(&self.multicast_group_queue_item.id).await?;
return Err(anyhow!("Queue item has expired and has been discarded"));
return Err(Error::Abort);
}
}
Ok(())
}
async fn validate_payload_size(&self) -> Result<()> {
async fn validate_payload_size(&self) -> Result<(), Error> {
trace!("Validating payload size for DR");
let mg = self.multicast_group.as_ref().unwrap();
let region_conf = region::get(&self.region_config_id)?;
@ -127,9 +137,7 @@ impl Multicast {
"Discarding multicast-group queue item because it exceeds max. payload size"
);
multicast::delete_queue_item(&self.multicast_group_queue_item.id).await?;
return Err(anyhow!(
"Queue item exceeds max payload and has been discarded"
));
return Err(Error::Abort);
}
Ok(())

20
chirpstack/src/test/multicast_test.rs
View File

@ -207,20 +207,12 @@ async fn test_multicast() {
MulticastTest {
name: "item discarded because of payload size".into(),
multicast_group: mg.clone(),
multicast_group_queue_items: vec![
multicast::MulticastGroupQueueItem {
multicast_group_id: mg.id,
f_port: 5,
data: vec![2; 300],
..Default::default()
},
multicast::MulticastGroupQueueItem {
multicast_group_id: mg.id,
f_port: 6,
data: vec![1, 2, 3],
..Default::default()
},
],
multicast_group_queue_items: vec![multicast::MulticastGroupQueueItem {
multicast_group_id: mg.id,
f_port: 5,
data: vec![2; 300],
..Default::default()
}],
assert: vec![assert::no_downlink_frame()],
},
MulticastTest {