From 27dcd62e1f5e6fe2a4a06a263d9a617665b09abc Mon Sep 17 00:00:00 2001 From: Bastian Gruber Date: Sun, 21 May 2023 14:53:46 +0200 Subject: [PATCH] Add better logs to debug --- problem_06/src/connection.rs | 6 ------ problem_06/src/db.rs | 14 ++++++-------- problem_06/src/heartbeat.rs | 3 +-- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/problem_06/src/connection.rs b/problem_06/src/connection.rs index fd7d9d9..4267a6f 100644 --- a/problem_06/src/connection.rs +++ b/problem_06/src/connection.rs @@ -5,7 +5,6 @@ use tokio::{ io::{AsyncReadExt, AsyncWriteExt, BufWriter}, net::TcpStream, }; -use tracing::{debug, info}; use crate::frame::{self, ClientFrames, ServerFrames}; @@ -36,9 +35,7 @@ impl Connection { pub async fn read_frame(&mut self) -> crate::Result> { loop { - info!("Loop read_frame"); if let Some(frame) = self.parse_frame()? { - info!("Frame parsed"); return Ok(Some(frame)); } @@ -56,13 +53,10 @@ impl Connection { use frame::Error::Incomplete; let mut buf = Cursor::new(&self.buffer[..]); - debug!(?buf); match ClientFrames::check(&mut buf) { Ok(_) => { - info!("Frame::check succesful"); let len = buf.position() as usize; - debug!(?len); buf.set_position(0); let frame = ClientFrames::parse(&mut buf)?; diff --git a/problem_06/src/db.rs b/problem_06/src/db.rs index 61e1683..3746e6c 100644 --- a/problem_06/src/db.rs +++ b/problem_06/src/db.rs @@ -5,7 +5,7 @@ use std::{ }; use tokio::sync::mpsc; -use tracing::debug; +use tracing::info; use crate::frame::ServerFrames; @@ -112,9 +112,9 @@ impl Db { } pub(crate) fn add_camera(&self, camera_id: CameraId, camera: Camera) { + info!("Add new camera: {camera:?}"); let mut state = self.state.lock().unwrap(); state.cameras.insert(camera_id, camera); - debug!(?state); } pub(crate) fn add_dispatcher( @@ -123,6 +123,7 @@ impl Db { roads: Vec, writer_stream: mpsc::Sender, ) { + info!("Add new dispatcher: {roads:?}"); let mut state = self.state.lock().unwrap(); for r in roads.iter() { @@ -132,8 +133,6 @@ impl Db { .or_insert(Vec::new()) .push((dispatcher_id.clone(), writer_stream.clone())); } - - debug!(?state); } pub(crate) fn get_dispatcher_for_road(&self, road: Road) -> Option> { @@ -147,6 +146,7 @@ impl Db { } pub(crate) fn add_open_ticket(&self, ticket: Ticket) { + info!("Add open ticket: {ticket:?}"); let mut state = self.state.lock().unwrap(); state .open_tickets @@ -165,7 +165,7 @@ impl Db { } pub(crate) fn add_plate(&self, camera_id: CameraId, plate: Plate) { - let state = self.state.lock().unwrap(); + info!("Add car: {plate:?}"); let camera = self.get_camera(camera_id).unwrap(); match self @@ -183,16 +183,14 @@ impl Db { ); } } - - debug!(?state); } pub(crate) fn ticket_plate(&self, day: u32, plate_name: String) { + info!("Add ticket for day: {day}:{plate_name}"); let mut state = self.state.lock().unwrap(); state .ticketed_plates_by_day .insert((Timestamp(day), plate_name)); - debug!(?state); } pub(crate) fn is_plate_ticketed_for_day(&self, day: u32, plate_name: String) -> bool { diff --git a/problem_06/src/heartbeat.rs b/problem_06/src/heartbeat.rs index f0c9b47..ba2a56f 100644 --- a/problem_06/src/heartbeat.rs +++ b/problem_06/src/heartbeat.rs @@ -1,7 +1,7 @@ use std::time::Duration; use tokio::sync::mpsc; -use tracing::{debug, error}; +use tracing::error; use crate::frame::ServerFrames; @@ -35,7 +35,6 @@ impl Heartbeat { interval.tick().await; loop { - debug!("Heartbeat"); interval.tick().await; if let Err(e) = self.message.send(ServerFrames::Heartbeat).await { error!("Error sending heartbeat: {}", e);