Release 2.4.1

Cargo.toml

@@ -5,7 +5,7 @@ members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/g
 
 [workspace.package]
 rust-version = "1.80"
-version = "2.4.0"
+version = "2.4.1"
 authors = ["Kevin Yue <[email protected]>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"

apps/gpservice/src/cli.rs

@@ -35,7 +35,7 @@ struct Cli {
 
 impl Cli {
   async fn run(&mut self) -> anyhow::Result<()> {
-    let redaction = self.init_logger()?;
+    let redaction = self.init_logger();
     info!("gpservice started: {}", VERSION);
 
     let lock_file = Arc::new(LockFile::new(GP_SERVICE_LOCK_FILE));
@@ -100,7 +100,7 @@ impl Cli {
     Ok(())
   }
 
-  fn init_logger(&self) -> anyhow::Result<Arc<Redaction>> {
+  fn init_logger(&self) -> Arc<Redaction> {
     let redaction = Arc::new(Redaction::new());
     let redaction_clone = Arc::clone(&redaction);
 
@@ -122,9 +122,9 @@ impl Cli {
 
     let level = self.verbose.log_level_filter().to_level().unwrap_or(log::Level::Info);
 
-    logger::init_with_logger(level, inner_logger)?;
+    logger::init_with_logger(level, inner_logger);
 
-    Ok(redaction)
+    redaction
   }
 
   fn prepare_api_key(&self) -> Vec<u8> {

changelog.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## [Unreleased]
+## 2.4.1 - 2025-01-09
 
-- Fix the issue with OpenSSL < 3.0.4
+- Fix the network issue with OpenSSL < 3.0.4
 - GUI: fix the Wayland compatibility issue
 - Support configure the log level
 - Log the detailed error message when network error occurs

crates/gpapi/src/logger.rs

@@ -2,40 +2,35 @@ use std::sync::OnceLock;
 
 use anyhow::bail;
 use env_logger::Logger;
-use log::Level;
+use log::{warn, Level};
 use log_reload::{ReloadHandle, ReloadLog};
 
 static LOG_HANDLE: OnceLock<ReloadHandle<log_reload::LevelFilter<Logger>>> = OnceLock::new();
 
-pub fn init(level: Level) -> anyhow::Result<()> {
+pub fn init(level: Level) {
   // Initialize the env_logger and global max level to trace, the logs will be
   // filtered by the outer logger
   let logger = env_logger::builder().filter_level(log::LevelFilter::Trace).build();
-  init_with_logger(level, logger)?;
-
-  Ok(())
+  init_with_logger(level, logger);
 }
 
-pub fn init_with_logger(level: Level, logger: Logger) -> anyhow::Result<()> {
+pub fn init_with_logger(level: Level, logger: Logger) {
   if let Some(_) = LOG_HANDLE.get() {
-    bail!("Logger already initialized")
-  } else {
-    log::set_max_level(log::LevelFilter::Trace);
+    warn!("Logger already initialized");
+    return;
+  }
 
-    // Create a new logger that will filter the logs based on the max level
-    let level_filter_logger = log_reload::LevelFilter::new(level, logger);
+  log::set_max_level(log::LevelFilter::Trace);
 
-    let reload_log = ReloadLog::new(level_filter_logger);
-    let handle = reload_log.handle();
+  // Create a new logger that will filter the logs based on the max level
+  let level_filter_logger = log_reload::LevelFilter::new(level, logger);
 
-    // Register the logger to be used by the log crate
-    log::set_boxed_logger(Box::new(reload_log))?;
-    LOG_HANDLE
-      .set(handle)
-      .map_err(|_| anyhow::anyhow!("Failed to set the logger"))?;
-  }
+  let reload_log = ReloadLog::new(level_filter_logger);
+  let handle = reload_log.handle();
 
-  Ok(())
+  // Register the logger to be used by the log crate
+  let _ = log::set_boxed_logger(Box::new(reload_log));
+  let _ = LOG_HANDLE.set(handle);
 }
 
 pub fn set_max_level(level: Level) -> anyhow::Result<()> {