diff --git a/applogic/src/api/logging.rs b/applogic/src/api/logging.rs index cddb4c86..536ae86c 100644 --- a/applogic/src/api/logging.rs +++ b/applogic/src/api/logging.rs @@ -9,7 +9,6 @@ use crate::StreamSink; pub struct LogEntry { pub time: DateTime, pub level: LogEntryLevel, - pub tag: String, pub target: String, pub msg: String, } @@ -34,6 +33,7 @@ impl From for LogEntryLevel { } } -pub fn create_log_stream(s: StreamSink) { - crate::logging::dart::set_stream_sink(s) +pub fn create_log_stream(_s: StreamSink) { + #[cfg(any(target_os = "android", target_os = "ios"))] + crate::logging::dart::set_stream_sink(_s) } diff --git a/applogic/src/logging/dart.rs b/applogic/src/logging/dart.rs index 10e0f761..4ed69f8e 100644 --- a/applogic/src/logging/dart.rs +++ b/applogic/src/logging/dart.rs @@ -20,12 +20,12 @@ static DART_SINK: LazyLock>>> = LazyLock::new(|| RwLock::new(None)); /// Tracing layer which forwards logs to the Dart side -pub(super) fn layer(tag: &'static str) -> impl Layer +pub(super) fn layer() -> impl Layer where S: Subscriber, for<'span> S: LookupSpan<'span>, { - SendToDartLayer { tag } + SendToDartLayer {} } pub(crate) fn set_stream_sink(stream_sink: StreamSink) { @@ -44,9 +44,7 @@ pub(crate) fn set_stream_sink(stream_sink: StreamSink) { } } -struct SendToDartLayer { - tag: &'static str, -} +struct SendToDartLayer {} impl SendToDartLayer { fn log(&self, level: tracing::Level, target: String, logline: String) { @@ -54,7 +52,6 @@ impl SendToDartLayer { let entry = LogEntry { time, level: level.into(), - tag: self.tag.to_string(), target, msg: logline, }; diff --git a/applogic/src/logging/mod.rs b/applogic/src/logging/mod.rs index 1adf1c9e..f72136e4 100644 --- a/applogic/src/logging/mod.rs +++ b/applogic/src/logging/mod.rs @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0-or-later +#[cfg(any(target_os = "android", target_os = "ios"))] pub(crate) mod dart; use std::sync::Once; @@ -34,7 +35,7 @@ fn do_init_logger() -> Result<(), TryInitError> { #[cfg(any(target_os = "android", target_os = "ios"))] { registry() - .with(dart::layer("phnx").with_filter(env_filter)) + .with(dart::layer().with_filter(env_filter)) .try_init()?; }