Add better logs to debug
This commit is contained in:
parent
1df7952986
commit
27dcd62e1f
3 changed files with 7 additions and 16 deletions
|
|
@ -5,7 +5,6 @@ use tokio::{
|
||||||
io::{AsyncReadExt, AsyncWriteExt, BufWriter},
|
io::{AsyncReadExt, AsyncWriteExt, BufWriter},
|
||||||
net::TcpStream,
|
net::TcpStream,
|
||||||
};
|
};
|
||||||
use tracing::{debug, info};
|
|
||||||
|
|
||||||
use crate::frame::{self, ClientFrames, ServerFrames};
|
use crate::frame::{self, ClientFrames, ServerFrames};
|
||||||
|
|
||||||
|
|
@ -36,9 +35,7 @@ impl Connection {
|
||||||
|
|
||||||
pub async fn read_frame(&mut self) -> crate::Result<Option<ClientFrames>> {
|
pub async fn read_frame(&mut self) -> crate::Result<Option<ClientFrames>> {
|
||||||
loop {
|
loop {
|
||||||
info!("Loop read_frame");
|
|
||||||
if let Some(frame) = self.parse_frame()? {
|
if let Some(frame) = self.parse_frame()? {
|
||||||
info!("Frame parsed");
|
|
||||||
return Ok(Some(frame));
|
return Ok(Some(frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -56,13 +53,10 @@ impl Connection {
|
||||||
use frame::Error::Incomplete;
|
use frame::Error::Incomplete;
|
||||||
|
|
||||||
let mut buf = Cursor::new(&self.buffer[..]);
|
let mut buf = Cursor::new(&self.buffer[..]);
|
||||||
debug!(?buf);
|
|
||||||
|
|
||||||
match ClientFrames::check(&mut buf) {
|
match ClientFrames::check(&mut buf) {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
info!("Frame::check succesful");
|
|
||||||
let len = buf.position() as usize;
|
let len = buf.position() as usize;
|
||||||
debug!(?len);
|
|
||||||
buf.set_position(0);
|
buf.set_position(0);
|
||||||
|
|
||||||
let frame = ClientFrames::parse(&mut buf)?;
|
let frame = ClientFrames::parse(&mut buf)?;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ use std::{
|
||||||
};
|
};
|
||||||
|
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tracing::debug;
|
use tracing::info;
|
||||||
|
|
||||||
use crate::frame::ServerFrames;
|
use crate::frame::ServerFrames;
|
||||||
|
|
||||||
|
|
@ -112,9 +112,9 @@ impl Db {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn add_camera(&self, camera_id: CameraId, camera: Camera) {
|
pub(crate) fn add_camera(&self, camera_id: CameraId, camera: Camera) {
|
||||||
|
info!("Add new camera: {camera:?}");
|
||||||
let mut state = self.state.lock().unwrap();
|
let mut state = self.state.lock().unwrap();
|
||||||
state.cameras.insert(camera_id, camera);
|
state.cameras.insert(camera_id, camera);
|
||||||
debug!(?state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn add_dispatcher(
|
pub(crate) fn add_dispatcher(
|
||||||
|
|
@ -123,6 +123,7 @@ impl Db {
|
||||||
roads: Vec<u16>,
|
roads: Vec<u16>,
|
||||||
writer_stream: mpsc::Sender<ServerFrames>,
|
writer_stream: mpsc::Sender<ServerFrames>,
|
||||||
) {
|
) {
|
||||||
|
info!("Add new dispatcher: {roads:?}");
|
||||||
let mut state = self.state.lock().unwrap();
|
let mut state = self.state.lock().unwrap();
|
||||||
|
|
||||||
for r in roads.iter() {
|
for r in roads.iter() {
|
||||||
|
|
@ -132,8 +133,6 @@ impl Db {
|
||||||
.or_insert(Vec::new())
|
.or_insert(Vec::new())
|
||||||
.push((dispatcher_id.clone(), writer_stream.clone()));
|
.push((dispatcher_id.clone(), writer_stream.clone()));
|
||||||
}
|
}
|
||||||
|
|
||||||
debug!(?state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn get_dispatcher_for_road(&self, road: Road) -> Option<mpsc::Sender<ServerFrames>> {
|
pub(crate) fn get_dispatcher_for_road(&self, road: Road) -> Option<mpsc::Sender<ServerFrames>> {
|
||||||
|
|
@ -147,6 +146,7 @@ impl Db {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn add_open_ticket(&self, ticket: Ticket) {
|
pub(crate) fn add_open_ticket(&self, ticket: Ticket) {
|
||||||
|
info!("Add open ticket: {ticket:?}");
|
||||||
let mut state = self.state.lock().unwrap();
|
let mut state = self.state.lock().unwrap();
|
||||||
state
|
state
|
||||||
.open_tickets
|
.open_tickets
|
||||||
|
|
@ -165,7 +165,7 @@ impl Db {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn add_plate(&self, camera_id: CameraId, plate: Plate) {
|
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();
|
let camera = self.get_camera(camera_id).unwrap();
|
||||||
|
|
||||||
match self
|
match self
|
||||||
|
|
@ -183,16 +183,14 @@ impl Db {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
debug!(?state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn ticket_plate(&self, day: u32, plate_name: String) {
|
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();
|
let mut state = self.state.lock().unwrap();
|
||||||
state
|
state
|
||||||
.ticketed_plates_by_day
|
.ticketed_plates_by_day
|
||||||
.insert((Timestamp(day), plate_name));
|
.insert((Timestamp(day), plate_name));
|
||||||
debug!(?state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn is_plate_ticketed_for_day(&self, day: u32, plate_name: String) -> bool {
|
pub(crate) fn is_plate_ticketed_for_day(&self, day: u32, plate_name: String) -> bool {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tracing::{debug, error};
|
use tracing::error;
|
||||||
|
|
||||||
use crate::frame::ServerFrames;
|
use crate::frame::ServerFrames;
|
||||||
|
|
||||||
|
|
@ -35,7 +35,6 @@ impl Heartbeat {
|
||||||
interval.tick().await;
|
interval.tick().await;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
debug!("Heartbeat");
|
|
||||||
interval.tick().await;
|
interval.tick().await;
|
||||||
if let Err(e) = self.message.send(ServerFrames::Heartbeat).await {
|
if let Err(e) = self.message.send(ServerFrames::Heartbeat).await {
|
||||||
error!("Error sending heartbeat: {}", e);
|
error!("Error sending heartbeat: {}", e);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue