Skip to content

Commit 2ec4797

Browse files
committed
Remove Clone on ProcessEventRequest
1 parent 804f421 commit 2ec4797

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

notifico-app/src/main.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use std::sync::Arc;
4040
use tracing::{debug, error, info, warn};
4141
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
4242
use url::Url;
43+
use uuid::Uuid;
4344

4445
const COMPONENT_WORKER: &str = "worker";
4546
const COMPONENT_UI: &str = "ui";
@@ -117,12 +118,10 @@ async fn main() {
117118
#[allow(unused_assignments)]
118119
let mut amqp_client = None;
119120
if let Some(amqp_url) = args.amqp {
121+
let container_name = format!("notifico-{}", Uuid::now_v7());
122+
120123
// Initialize AMQP client and replace local channels with AMQP ones
121-
amqp_client = Some(
122-
AmqpClient::connect(amqp_url, "wrk".to_string())
123-
.await
124-
.unwrap(),
125-
);
124+
amqp_client = Some(AmqpClient::connect(amqp_url, container_name).await.unwrap());
126125

127126
let (amqp_pipelines_tx, amqp_pipelines_rx) = amqp_client
128127
.as_mut()

notifico-core/src/pipeline/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use tracing::warn;
1212
use utoipa::ToSchema;
1313
use uuid::Uuid;
1414

15-
#[derive(Serialize, Deserialize, ToSchema, Debug, Clone)]
15+
#[derive(Serialize, Deserialize, ToSchema, Debug)]
1616
pub struct ProcessEventRequest {
1717
#[serde(default = "Uuid::now_v7")]
1818
pub id: Uuid,

notifico-core/src/queue.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use async_trait::async_trait;
22
use serde::{Deserialize, Serialize};
33
use std::any::Any;
44
use std::error::Error;
5-
use std::ops::Deref;
65
use tokio::sync::oneshot;
76

87
#[derive(Debug, Clone, Copy)]
@@ -22,7 +21,7 @@ pub trait SenderChannel: Send + Sync {
2221
async fn send_object(
2322
&self,
2423
message: Box<dyn Any + Send + Sync + 'static>,
25-
) -> Result<Outcome, Box<dyn std::error::Error>>;
24+
) -> Result<Outcome, Box<dyn Error>>;
2625
fn message_kind(&self) -> MessageKind;
2726
}
2827

@@ -57,7 +56,7 @@ pub trait ReceiverChannel: Send + Sync {
5756
impl dyn ReceiverChannel {
5857
pub async fn receive<T>(&self) -> Result<(T, oneshot::Sender<Outcome>), Box<dyn Error>>
5958
where
60-
T: for<'de> Deserialize<'de> + Send + Sync + Clone + Sized + 'static,
59+
T: for<'de> Deserialize<'de> + Send + Sync + Sized + 'static,
6160
{
6261
let result = self.receive_object().await?;
6362
match self.message_kind() {
@@ -74,7 +73,7 @@ impl dyn ReceiverChannel {
7473
}
7574
MessageKind::Object => {
7675
let message = result.0.downcast::<T>().unwrap();
77-
Ok((message.deref().clone(), result.1))
76+
Ok((*message, result.1))
7877
}
7978
}
8079
}

0 commit comments

Comments
 (0)