From e342a07e326cd9e79f7510a2011740884e2fdb9e Mon Sep 17 00:00:00 2001 From: Jamil Date: Fri, 19 Jan 2024 22:08:55 -0800 Subject: [PATCH] Use INFO for phoenix-channel portal connection (#3328) Will help debug connection issues to the portal --- kotlin/android/app/build.gradle.kts | 6 ++++-- rust/phoenix-channel/src/lib.rs | 4 ++-- rust/windows-client/src-tauri/src/client/settings.rs | 4 ++-- .../FirezoneKit/Sources/FirezoneKit/Models/Settings.swift | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 2f2efedec..0023eaa6e 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -76,7 +76,8 @@ android { buildConfigField( "String", "LOG_FILTER", - "\"connlib_client_android=debug,firezone_tunnel=trace,connlib_shared=debug,connlib_client_shared=debug,warn\"", + "\"connlib_client_android=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug," + + "connlib_client_shared=debug,warn\"", ) } @@ -110,7 +111,8 @@ android { buildConfigField( "String", "LOG_FILTER", - "\"connlib_client_android=info,firezone_tunnel=trace,connlib_shared=info,connlib_client_shared=info,webrtc=error,warn\"", + "\"connlib_client_android=info,firezone_tunnel=trace,phoenix_channel=info,connlib_shared=info," + + "connlib_client_shared=info,webrtc=error,warn\"", ) firebaseAppDistribution { serviceCredentialsFile = System.getenv("FIREBASE_CREDENTIALS_PATH") diff --git a/rust/phoenix-channel/src/lib.rs b/rust/phoenix-channel/src/lib.rs index a5ea19e62..a1462670b 100644 --- a/rust/phoenix-channel/src/lib.rs +++ b/rust/phoenix-channel/src/lib.rs @@ -147,11 +147,11 @@ where /// The provided URL must contain a host. /// Additionally, you must already provide any query parameters required for authentication. pub async fn connect(secret_url: Secret, user_agent: String) -> Result { - tracing::trace!("Trying to connect to the portal..."); + tracing::info!("Trying to connect to the portal..."); let (stream, _) = connect_async(make_request(secret_url, user_agent)?).await?; - tracing::trace!("Successfully connected to portal"); + tracing::info!("Successfully connected to portal"); Ok(Self { stream, diff --git a/rust/windows-client/src-tauri/src/client/settings.rs b/rust/windows-client/src-tauri/src/client/settings.rs index 49cbe9e1c..1d241c2c9 100644 --- a/rust/windows-client/src-tauri/src/client/settings.rs +++ b/rust/windows-client/src-tauri/src/client/settings.rs @@ -21,7 +21,7 @@ impl Default for AdvancedSettings { Self { auth_base_url: Url::parse("https://app.firez.one").unwrap(), api_url: Url::parse("wss://api.firez.one").unwrap(), - log_filter: "firezone_windows_client=debug,firezone_tunnel=trace,connlib_shared=debug,connlib_client_shared=debug,warn".to_string(), + log_filter: "firezone_windows_client=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,warn".to_string(), } } } @@ -32,7 +32,7 @@ impl Default for AdvancedSettings { Self { auth_base_url: Url::parse("https://app.firezone.dev").unwrap(), api_url: Url::parse("wss://api.firezone.dev").unwrap(), - log_filter: "firezone_windows_client=info,firezone_tunnel=trace,connlib_shared=info,connlib_client_shared=info,webrtc=error,warn".to_string(), + log_filter: "firezone_windows_client=info,firezone_tunnel=trace,phoenix_channel=info,connlib_shared=info,connlib_client_shared=info,webrtc=error,warn".to_string(), } } } diff --git a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift index dd70a5a21..f33cd175a 100644 --- a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift +++ b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift @@ -31,7 +31,7 @@ struct AdvancedSettings: Equatable { authBaseURLString: "https://app.firez.one/", apiURLString: "wss://api.firez.one/", connlibLogFilterString: - "connlib_client_apple=debug,firezone_tunnel=trace,connlib_shared=debug,connlib_client_shared=debug,warn" + "connlib_client_apple=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,warn" ) #else AdvancedSettings( @@ -39,7 +39,7 @@ struct AdvancedSettings: Equatable { apiURLString: "wss://api.firezone.dev/", connlibLogFilterString: "connlib_client_apple=info,firezone_tunnel=trace," - + "connlib_shared=info,connlib_client_shared=info,webrtc=error,warn" + + "connlib_shared=info,phoenix_channel=info,connlib_client_shared=info,webrtc=error,warn" ) #endif }()