bin/roowhod: configure loglevel via config file, use journald protocol

src/bin/roowhod.rs

@@ -9,10 +9,11 @@ use anyhow::Context;
 use clap::Parser;
 use tokio::{net::UdpSocket, sync::RwLock};
 use tokio_util::sync::CancellationToken;
-use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
+use tracing::level_filters::LevelFilter;
+use tracing_subscriber::layer::SubscriberExt;
 
 use roowho2_lib::server::{
-    config::DEFAULT_CONFIG_PATH,
+    config::{DEFAULT_CONFIG_PATH, LogLevel},
     rwhod::{RwhodStatusStore, rwhod_packet_receiver_task, rwhod_packet_sender_task},
     varlink_api::varlink_client_server_task,
 };
@@ -38,11 +39,6 @@ struct Args {
 async fn main() -> anyhow::Result<()> {
     let args = Args::parse();
 
-    tracing_subscriber::registry()
-        .with(fmt::layer())
-        .with(EnvFilter::from_default_env())
-        .init();
-
     let config = toml::from_str::<roowho2_lib::server::config::Config>(
         &std::fs::read_to_string(&args.config_path).context(format!(
             "Failed to read configuration file {:?}",
@@ -50,6 +46,19 @@ async fn main() -> anyhow::Result<()> {
         ))?,
     )?;
 
+    let log_filter = match config.log_level.unwrap_or(LogLevel::Info) {
+        LogLevel::Info => LevelFilter::INFO,
+        LogLevel::Debug => LevelFilter::DEBUG,
+        LogLevel::Trace => LevelFilter::TRACE,
+    };
+
+    let subscriber = tracing_subscriber::registry()
+        .with(log_filter)
+        .with(tracing_journald::layer()?);
+
+    tracing::subscriber::set_global_default(subscriber)
+        .context("Failed to set global default tracing subscriber")?;
+
     let fd_map: HashMap<String, OwnedFd> =
         HashMap::from_iter(sd_notify::listen_fds_with_names()?.map(|(fd_num, name)| {
             (

src/server/config.rs

@@ -8,6 +8,9 @@ pub const DEFAULT_CLIENT_SOCKET_PATH: &str = "/run/roowho2/server_client.sock";
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Config {
+    /// Logging level for the daemon.
+    pub log_level: Option<LogLevel>,
+
     /// Configuration for the rwhod server.
     pub rwhod: RwhodConfig,
 
@@ -17,6 +20,14 @@ pub struct Config {
     pub client_socket_path: Option<String>,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum LogLevel {
+    Info,
+    Debug,
+    Trace,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct RwhodConfig {
     /// Enable or disable the rwhod server functionality.