Add --logfile FILENAME option

kiron1 · Jan 19, 2025 · 432567c · 432567c
1 parent 8d473b3
commit 432567c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/paclib/src/engine.rs b/paclib/src/engine.rs
@@ -68,10 +68,7 @@ impl<'a> Engine<'a> {
             )
             .expect("register_global_property");
         }
-        Self {
-            js,
-            my_ip_addr,
-        }
+        Self { js, my_ip_addr }
     }
 
     pub fn with_pac_script(pac_script: &str) -> Result<Self, PacScriptError> {

diff --git a/proxydetox/src/main.rs b/proxydetox/src/main.rs
@@ -24,8 +24,6 @@ use tracing_subscriber::filter::EnvFilter;
 pub extern "C" fn main() {
     let config = Options::load_without_rcfile();
 
-    setup_tracing(&config.log_level);
-
     if let Err(error) = run(config) {
         tracing::error!(%error, "fatal error");
         write_error(&mut std::io::stderr(), error).ok();
@@ -37,16 +35,14 @@ pub extern "C" fn main() {
 fn main() {
     let config = Options::load();
 
-    setup_tracing(&config.log_level);
-
     if let Err(error) = run(config) {
         tracing::error!(%error, "fatal error");
         write_error(&mut std::io::stderr(), error).ok();
         std::process::exit(1);
     }
 }
 
-fn setup_tracing(log_level: &tracing::level_filters::LevelFilter) {
+fn setup_tracing(log_level: &tracing::level_filters::LevelFilter, logfile: Option<File>) {
     let env_name = format!("{}_LOG", env!("CARGO_PKG_NAME").to_uppercase());
 
     let filter = if let Ok(filter) = EnvFilter::try_from_env(&env_name) {
@@ -78,23 +74,23 @@ fn setup_tracing(log_level: &tracing::level_filters::LevelFilter) {
                     .parse()
                     .expect("directive"),
             )
-            .add_directive(
-                format!("paclib={0}", log_level)
-                    .parse()
-                    .expect("directive"),
-            )
+            .add_directive(format!("paclib={0}", log_level).parse().expect("directive"))
             .add_directive(
                 format!("proxy_client={0}", log_level)
                     .parse()
                     .expect("directive"),
             )
     };
 
-    tracing_subscriber::fmt()
+    let fmt = tracing_subscriber::fmt()
         .compact()
         .with_timer(tracing_subscriber::fmt::time::uptime())
-        .with_env_filter(filter)
-        .init();
+        .with_env_filter(filter);
+    if let Some(f) = logfile {
+        fmt.with_writer(f).init();
+    } else {
+        fmt.with_writer(std::io::stderr).init();
+    }
 }
 
 fn write_error<W, E>(writer: &mut W, error: E) -> std::io::Result<()>
@@ -114,6 +110,9 @@ where
 
 #[tokio::main]
 async fn run(config: Arc<Options>) -> Result<(), proxydetoxlib::Error> {
+    let logfile = config.log_filepath.as_ref().map(File::create).transpose()?;
+
+    setup_tracing(&config.log_level, logfile);
     let auth = match &config.authorization {
         #[cfg(feature = "negotiate")]
         Authorization::Negotiate(ref negotiate) => {

diff --git a/proxydetox/src/options.rs b/proxydetox/src/options.rs
@@ -27,6 +27,7 @@ pub enum Authorization {
 #[derive(Debug)]
 pub struct Options {
     pub log_level: LevelFilter,
+    pub log_filepath: Option<PathBuf>,
     pub pac_file: Option<PathOrUri>,
     pub my_ip_address: Option<IpAddr>,
     pub authorization: Authorization,
@@ -147,6 +148,14 @@ impl Options {
                     .action(ArgAction::Count)
                     .help("Decreases verbosity level"),
             )
+            .arg(
+                Arg::new("log_filepath")
+                    .long("logfile")
+                    .value_name("FILEPATH")
+                    .help("Log to file instead of stderr")
+                    .value_parser(clap::value_parser!(PathBuf))
+                    .action(clap::ArgAction::Set)
+            )
             .arg(
                  Arg::new("activate_socket")
                      .long("activate-socket")
@@ -346,6 +355,7 @@ impl From<ArgMatches> for Options {
 
         Self {
             log_level,
+            log_filepath: m.get_one("log_filepath").cloned(),
             pac_file: m
                 .get_one::<PathOrUri>("pac_file")
                 .cloned()