diff --git a/Cargo.lock b/Cargo.lock index 1b64983..b11684d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,7 +132,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.14", ] [[package]] @@ -285,6 +285,9 @@ dependencies = [ "color-eyre", "serde", "toml", + "tracing", + "tracing-error", + "tracing-subscriber", ] [[package]] @@ -305,6 +308,24 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + [[package]] name = "memchr" version = "2.5.0" @@ -320,6 +341,16 @@ dependencies = [ "adler", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "object" version = "0.30.3" @@ -335,6 +366,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owo-colors" version = "3.5.0" @@ -365,6 +402,30 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "regex" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "rustc-demangle" version = "0.1.22" @@ -402,7 +463,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.14", ] [[package]] @@ -423,12 +484,29 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.14" @@ -492,9 +570,21 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "tracing-core" version = "0.1.30" @@ -515,15 +605,33 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", "sharded-slab", + "smallvec", "thread_local", + "tracing", "tracing-core", + "tracing-log", ] [[package]] @@ -565,6 +673,28 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index de948c8..5e87427 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,6 @@ clap = { version = "4.2.1", features = ["cargo", "color", "unicode", "std", "der color-eyre = "0.6.2" serde = { version = "1.0.160", features = ["derive"] } toml = "0.7.3" +tracing = "0.1.37" +tracing-error = "0.2.0" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } diff --git a/src/main.rs b/src/main.rs index 0d93f9f..0b8bf3e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ -use std::fs; -use std::io::{stdin, ErrorKind, Read, Write}; +use std::fs::{self, File}; +use std::io::{stderr, stdin, ErrorKind, Read, Write}; use std::os::unix::net::{UnixListener, UnixStream}; use std::path::PathBuf; use std::thread; @@ -8,6 +8,10 @@ use clap::{Parser, Subcommand}; use color_eyre::eyre::Context; use color_eyre::Result; use serde::Deserialize; +use tracing::metadata::LevelFilter; +use tracing_error::ErrorLayer; +use tracing_subscriber::fmt; +use tracing_subscriber::prelude::*; #[derive(Parser)] #[command(author, version, about, long_about = None)] @@ -15,6 +19,9 @@ struct Cli { /// Set the level of verbosity #[arg(short, long, action = clap::ArgAction::Count)] verbose: u8, + /// File to write log events to + #[arg(long, value_name = "FILENAME")] + log: Option, /// The command to run #[command(subcommand)] command: Command, @@ -36,9 +43,35 @@ struct Request { session: String, } +#[tracing::instrument] fn main() -> Result<()> { let cli = Cli::parse(); + { + let filter_layer = match cli.verbose { + 0 => LevelFilter::WARN, + 1 => LevelFilter::INFO, + 2 => LevelFilter::DEBUG, + _ => LevelFilter::TRACE, + }; + let stderr_layer = fmt::layer().pretty().with_writer(stderr); + let file_layer = if let Some(path) = cli.log { + let f = File::create(&path) + .wrap_err_with(|| format!("Failed to create log file '{}'", path.display()))?; + let layer = fmt::layer().pretty().with_writer(f); + Some(layer) + } else { + None + }; + + tracing_subscriber::registry() + .with(filter_layer) + .with(stderr_layer) + .with(file_layer) + .with(ErrorLayer::new(fmt::format::Pretty::default())) + .init(); + } + let runtime_dir = std::env::var("XDG_RUNTIME_DIR") .map(PathBuf::from) .unwrap_or_else(|_| "/var".into()) @@ -61,11 +94,13 @@ fn main() -> Result<()> { let listener = UnixListener::bind(&path) .wrap_err_with(|| format!("Failed to bind listener to {}", path.display()))?; + tracing::info!("Listening on {}", path.display()); + for stream in listener.incoming() { let stream = stream.wrap_err("Failed to accept incoming connection")?; thread::spawn(|| { if let Err(err) = handle_connection(stream) { - eprintln!("{:?}", err); + tracing::error!("{:?}", err); } }); } @@ -77,31 +112,37 @@ fn main() -> Result<()> { stdin() .read_to_string(&mut buf) .wrap_err("Failed to read stdin")?; - let mut socket = { - let req: Request = toml::from_str(&buf).wrap_err("Failed to parse request")?; - let path = runtime_dir.join(req.session).with_extension("s"); - UnixStream::connect(&path).wrap_err_with(|| { - format!("Failed to connect to daemon socket {}", path.display()) - })? - }; + let req: Request = toml::from_str(&buf).wrap_err("Failed to parse request")?; + + tracing::trace!("Received request: {:?}", req); + + let path = runtime_dir.join(&req.session).with_extension("s"); + tracing::debug!(path = %path.display()); + + let mut socket = UnixStream::connect(&path).wrap_err_with(|| { + format!("Failed to connect to daemon socket {}", path.display()) + })?; socket .write_all(buf.as_bytes()) .wrap_err("Failed to send response")?; + tracing::info!("Sent request to {}", path.display()); + Ok(()) } } } +#[tracing::instrument(skip_all)] fn handle_connection(mut read: impl Read) -> Result<()> { let mut buf = String::new(); read.read_to_string(&mut buf) .wrap_err("Failed to read stdin")?; let req: Request = toml::from_str(&buf).wrap_err("Failed to parse request")?; - dbg!(req); + tracing::info!("Received request: {:?}", req); todo!(); }