From 7767150308cce2df9aaa162de423dd9de67359e5 Mon Sep 17 00:00:00 2001
From: Raphael <raphael.goetz.7@gmail.com>
Date: Tue, 15 Apr 2025 11:59:56 +0200
Subject: [PATCH 1/2] feat: added some more logs

---
 src/flow_queue/service.rs | 41 ++++++++++++++++++++-------------------
 src/flow_store/service.rs |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/flow_queue/service.rs b/src/flow_queue/service.rs
index 16df657..086efe7 100644
--- a/src/flow_queue/service.rs
+++ b/src/flow_queue/service.rs
@@ -211,17 +211,17 @@ impl RabbitmqClient {
 
             match consumer_res {
                 Ok(consumer) => consumer,
-                Err(err) => panic!("{}", err),
+                Err(err) => panic!("Cannot consume messages: {}", err),
             }
         };
 
-        println!("Starting to consume from {}", queue_name);
+        debug!("Starting to consume from {}", queue_name);
 
         while let Some(delivery) = consumer.next().await {
             let delivery = match delivery {
                 Ok(del) => del,
                 Err(err) => {
-                    println!("Error receiving message: {}", err);
+                    log::error!("Error receiving message: {}", err);
                     return Err(err);
                 }
             };
@@ -229,50 +229,51 @@ impl RabbitmqClient {
             let data = &delivery.data;
             let message_str = match std::str::from_utf8(&data) {
                 Ok(str) => {
-                    println!("Received message: {}", str);
+                    log::info!("Received message: {}", str);
                     str
                 }
                 Err(err) => {
-                    println!("Error decoding message: {}", err);
+                    log::error!("Error decoding message: {}", err);
                     return Ok(());
                 }
             };
             // Parse the message
             let inc_message = match serde_json::from_str::<Message>(message_str) {
-                Ok(mess) => {
-                    println!("Parsed message with telegram_id: {}", mess.message_id);
-                    mess
-                }
+                Ok(mess) => mess,
                 Err(err) => {
-                    println!("Error parsing message: {}", err);
+                    log::error!("Error parsing message: {}", err);
                     return Ok(());
                 }
             };
 
             let message = match handle_message(inc_message) {
-                Ok(mess) => {
-                    println!("Handled message with telegram_id: {}", mess.message_id);
-                    mess
-                }
+                Ok(mess) => mess,
                 Err(err) => {
-                    println!("Error handling message: {}", err);
+                    log::error!("Error handling message: {}", err);
                     return Ok(());
                 }
             };
 
-            let message_json = serde_json::to_string(&message).unwrap();
-
-            println!("{}", message_json);
+            let message_json = match serde_json::to_string(&message) {
+                Ok(json) => json,
+                Err(err) => {
+                    log::error!("Error serializing message: {}", err);
+                    return Ok(());
+                }
+            };
 
             {
                 let _ = self.send_message(message_json, "recieve_queue").await;
             }
 
             // Acknowledge the message
-            delivery
+            match delivery
                 .ack(lapin::options::BasicAckOptions::default())
                 .await
-                .expect("Failed to acknowledge message");
+            {
+                Ok(_) => Ok(()),
+                Err(err) => log::error!("Failed to acknowledge message: {}", err),
+            }
         }
 
         Ok(())
diff --git a/src/flow_store/service.rs b/src/flow_store/service.rs
index f2b416a..f455254 100644
--- a/src/flow_store/service.rs
+++ b/src/flow_store/service.rs
@@ -109,7 +109,7 @@ impl FlowStoreServiceBase for FlowStoreService {
             match connection.keys("*").await {
                 Ok(res) => res,
                 Err(error) => {
-                    print!("Can't retrieve keys from redis. Reason: {error}");
+                    error!("Can't retrieve keys from redis. Reason: {error}");
                     return Err(error);
                 }
             }

From ad0fe855619da242598391eb567203707b7ff536 Mon Sep 17 00:00:00 2001
From: Raphael <raphael.goetz.7@gmail.com>
Date: Sat, 19 Apr 2025 17:29:56 +0200
Subject: [PATCH 2/2] fix: removed match

---
 src/flow_queue/service.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/flow_queue/service.rs b/src/flow_queue/service.rs
index 086efe7..222014f 100644
--- a/src/flow_queue/service.rs
+++ b/src/flow_queue/service.rs
@@ -267,13 +267,10 @@ impl RabbitmqClient {
             }
 
             // Acknowledge the message
-            match delivery
+            delivery
                 .ack(lapin::options::BasicAckOptions::default())
                 .await
-            {
-                Ok(_) => Ok(()),
-                Err(err) => log::error!("Failed to acknowledge message: {}", err),
-            }
+                .expect("Failed to acknowledge message");
         }
 
         Ok(())