From b0e20d8a418e58812b4f7088ba45a4be7bc9922d Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Tue, 13 May 2025 13:55:59 +1000 Subject: [PATCH] fix(gui-client): initialise logger one layer up (#9111) Initialising the logger as part of the `open` function causes a flaky test in case there is already another logger initialised. Fixes: #9096 --- rust/gui-client/src-tauri/src/bin/firezone-gui-client.rs | 2 ++ rust/gui-client/src-tauri/src/deep_link/linux.rs | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rust/gui-client/src-tauri/src/bin/firezone-gui-client.rs b/rust/gui-client/src-tauri/src/bin/firezone-gui-client.rs index 61052b560..947422567 100644 --- a/rust/gui-client/src-tauri/src/bin/firezone-gui-client.rs +++ b/rust/gui-client/src-tauri/src/bin/firezone-gui-client.rs @@ -70,6 +70,8 @@ fn main() -> anyhow::Result<()> { // If we already tried to elevate ourselves, don't try again Some(Cmd::Elevated) => run_gui(config), Some(Cmd::OpenDeepLink(deep_link)) => { + firezone_gui_client::logging::setup_stdout()?; + let rt = tokio::runtime::Runtime::new()?; if let Err(error) = rt.block_on(deep_link::open(&deep_link.url)) { tracing::error!("Error in `OpenDeepLink`: {error:#}"); diff --git a/rust/gui-client/src-tauri/src/deep_link/linux.rs b/rust/gui-client/src-tauri/src/deep_link/linux.rs index 67bdb1e3c..749b6558a 100644 --- a/rust/gui-client/src-tauri/src/deep_link/linux.rs +++ b/rust/gui-client/src-tauri/src/deep_link/linux.rs @@ -86,7 +86,6 @@ impl Server { pub async fn open(url: &url::Url) -> Result<()> { crate::logging::setup_stdout()?; - let path = sock_path()?; let mut stream = UnixStream::connect(&path).await?;