migrate logging to tracing

Author: br0kenpixel

Cargo.lock

@@ -35,14 +35,7 @@ confy = { version = "0.6.1", default-features = false, features = [
     "yaml_conf",
 ] }
 homedir = { version = "0.3.4", default-features = false }
-log = { version = "0.4.27", features = ["std", "max_level_debug"] }
 serde = { version = "1.0.219", features = ["derive"] }
-simple_logger = { version = "5.0.0", default-features = false, features = [
-    "colors",
-    "colored",
-    "stderr",
-    "timestamps",
-] }
 thiserror = "2.0.12"
 time = { version = "0.3.37", default-features = false, features = ["macros"] }
 users = { version = "0.11.0", default-features = false }
@@ -53,3 +46,6 @@ libc = { version = "0.2.172", default-features = false }
 semaphore = "0.4.0"
 circular-queue = "0.2.7"
 iana-time-zone = "0.1.63"
+tracing-subscriber = "0.3.19"
+tracing = "0.1.41"
+chrono = "0.4.41"

Cargo.toml

@@ -3,7 +3,7 @@ use crate::{
     server::{config::Config, db::DatabaseClient},
 };
 use color_print::cprintln;
-use log::{debug, error, info};
+use tracing::{debug, error, info};
 use std::{io::stdin, process::exit};
 
 pub async fn main(cmd: DatabaseCommand, config: &Config) {

src/dbmgr/mod.rs

@@ -1,4 +1,5 @@
 use std::{io, num::TryFromIntError};
+use tracing::subscriber::SetGlobalDefaultError;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -24,7 +25,7 @@ pub enum Error {
 
     /// Failed to set up the logger.
     #[error("Failed to set global logger")]
-    LogInit(#[from] log::SetLoggerError),
+    LogInit(#[from] SetGlobalDefaultError),
 
     /// Integer conversion error.
     #[error("Integer conversion error: {0}")]

src/error.rs

@@ -0,0 +1,24 @@
+use crate::error::Error;
+use std::time::SystemTime;
+use tracing_subscriber::fmt::{format::Writer, time::FormatTime};
+
+struct DateTimeFormatter;
+
+impl FormatTime for DateTimeFormatter {
+    fn format_time(&self, w: &mut Writer<'_>) -> std::fmt::Result {
+        let now = SystemTime::now();
+        let datetime: chrono::DateTime<chrono::Local> = now.into();
+        write!(w, "{}", datetime.format("%d.%m.%Y/%H:%M:%S"))
+    }
+}
+
+pub fn setup() -> Result<(), Error> {
+    let subscriber = tracing_subscriber::fmt()
+        .compact()
+        .with_timer(DateTimeFormatter)
+        .with_target(false)
+        .finish();
+    tracing::subscriber::set_global_default(subscriber)?;
+
+    Ok(())
+}

src/logging.rs

@@ -1,15 +1,14 @@
 use clap::Parser;
 use cli::Command;
-use log::{debug, error, info};
 use server::config::Config;
-use simple_logger::SimpleLogger;
 use sqlx::migrate::Migrator;
 use std::process::exit;
-use time::macros::format_description;
+use tracing::{debug, error, info};
 
 mod cli;
 mod dbmgr;
 mod error;
+mod logging;
 mod server;
 mod svcmgr;
 mod tester;
@@ -20,18 +19,7 @@ pub static MIGRATOR: Migrator = sqlx::migrate!();
 async fn main() -> Result<(), error::Error> {
     let args = cli::Cli::parse();
 
-    let logger = SimpleLogger::new().with_timestamp_format(format_description!(
-        "[year]-[month]-[day] [hour]:[minute]:[second]"
-    ));
-
-    let log_level = if args.debug || cfg!(debug_assertions) {
-        log::LevelFilter::Debug
-    } else {
-        log::LevelFilter::Info
-    };
-
-    let logger = logger.with_level(log_level);
-    logger.init()?;
+    logging::setup()?;
 
     info!("PixelWeather Server v{}", env!("CARGO_PKG_VERSION"));
     debug!("Arguments: {args:?}");

src/main.rs

@@ -2,7 +2,6 @@ use super::db::{DatabaseClient, FirmwareBlob, MeasurementId, NodeId};
 use crate::error::Error;
 use arrayref::array_ref;
 use circular_queue::CircularQueue;
-use log::{debug, error, warn};
 use pwmp_client::pwmp_msg::{
     Message, MsgId, mac::Mac, request::Request, response::Response, version::Version,
 };
@@ -11,6 +10,7 @@ use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},
     net::TcpStream,
 };
+use tracing::{debug, error, warn};
 
 const RCV_BUFFER_SIZE: usize = 1024;
 const ID_CACHE_SIZE: usize = 32;

src/server/client.rs

@@ -5,7 +5,7 @@ use super::{
     rate_limit::RateLimiter,
 };
 use crate::error::Error;
-use log::{debug, error, warn};
+use tracing::{debug, error, warn};
 use pwmp_client::pwmp_msg::{request::Request, response::Response};
 use std::{io::Read, net::SocketAddr, sync::Arc, time::Duration};
 use tokio::{net::TcpStream, time::timeout};

src/server/client_handle.rs

@@ -1,6 +1,5 @@
 use super::{config::Config, db::DatabaseClient, rate_limit::RateLimiter};
 use crate::server::client_handle::handle_client;
-use log::{debug, error, info, warn};
 use semaphore::Semaphore;
 use std::{net::SocketAddr, panic, sync::Arc, time::Duration};
 use tokio::{
@@ -9,6 +8,7 @@ use tokio::{
     select,
     signal::unix::Signal,
 };
+use tracing::{debug, error, info, warn};
 
 #[allow(clippy::needless_pass_by_value)]
 pub async fn server_loop(

src/server/handle.rs

@@ -1,12 +1,12 @@
 use crate::server::{db::DatabaseClient, handle::server_loop};
 use config::Config;
 use libc::{IPPROTO_TCP, SO_KEEPALIVE, SO_LINGER, SOL_SOCKET, TCP_NODELAY, linger, socklen_t};
-use log::{debug, error, info, warn};
 use std::{ffi::c_int, io, mem, os::fd::AsRawFd, process::exit, sync::Arc};
 use tokio::{
     net::TcpListener,
     signal::unix::{Signal, SignalKind, signal},
 };
+use tracing::{debug, error, info, warn};
 
 mod client;
 mod client_handle;