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

Fix merging device-profile and device tags.

Browse Source
This commit is contained in:
Orne Brocaar 2022-07-01 14:53:29 +01:00
parent 777b95ef1d
commit fb74bda3fd
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chirpstack/src/downlink/data.rs
View File

@ -305,7 +305,7 @@ impl Data {
dev_eui: self.device.dev_eui.to_string(),
tags: {
let mut tags = (&*self.device_profile.tags).clone();
tags.clone_from(&*self.device.tags);
tags.extend((*self.device.tags).clone());
tags
},
};

4
chirpstack/src/downlink/tx_ack.rs
View File

@ -295,7 +295,7 @@ impl TxAck {
let dev = self.device.as_ref().unwrap();
let mut tags = (&*dp.tags).clone();
tags.clone_from(&*dev.tags);
tags.extend((*dev.tags).clone());
let pl = integration_pb::LogEvent {
time: Some(Utc::now().into()),
@ -331,7 +331,7 @@ impl TxAck {
let qi = self.device_queue_item.as_ref().unwrap();
let mut tags = (&*dp.tags).clone();
tags.clone_from(&*dev.tags);
tags.extend((*dev.tags).clone());
let downlink_id = self.downlink_frame.as_ref().unwrap().downlink_id;
let gateway_id = self

4
chirpstack/src/uplink/data.rs
View File

@ -219,7 +219,7 @@ impl Data {
let dev = self.device.as_ref().unwrap();
let mut tags = (&*dp.tags).clone();
tags.clone_from(&*dev.tags);
tags.extend((*dev.tags).clone());
self.device_info = Some(integration_pb::DeviceInfo {
tenant_id: tenant.id.to_string(),
@ -807,7 +807,7 @@ impl Data {
device_queue::delete_item(&qi.id).await?;
let mut tags = (&*dp.tags).clone();
tags.clone_from(&*dev.tags);
tags.extend((*dev.tags).clone());
integration::ack_event(
&app.id,

2
chirpstack/src/uplink/join.rs
View File

@ -194,7 +194,7 @@ impl JoinRequest {
let dev = self.device.as_ref().unwrap();
let mut tags = (&*dp.tags).clone();
tags.clone_from(&*dev.tags);
tags.extend((*dev.tags).clone());
self.device_info = Some(integration_pb::DeviceInfo {
tenant_id: tenant.id.to_string(),

2
chirpstack/src/uplink/join_sns.rs
View File

@ -172,7 +172,7 @@ impl JoinRequest {
let dev = self.device.as_ref().unwrap();
let mut tags = (&*dp.tags).clone();
tags.clone_from(&*dev.tags);
tags.extend((*dev.tags).clone());
self.device_info = Some(integration_pb::DeviceInfo {
tenant_id: tenant.id.to_string(),