remove unused tag from dart logging layer

phnx-im · Dec 18, 2024 · b020ef9 · b020ef9
1 parent 22db4d2
commit b020ef9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git 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<Utc>,
     pub level: LogEntryLevel,
-    pub tag: String,
     pub target: String,
     pub msg: String,
 }
@@ -34,6 +33,7 @@ impl From<tracing::Level> for LogEntryLevel {
     }
 }
 
-pub fn create_log_stream(s: StreamSink<LogEntry>) {
-    crate::logging::dart::set_stream_sink(s)
+pub fn create_log_stream(_s: StreamSink<LogEntry>) {
+    #[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
@@ -20,12 +20,12 @@ static DART_SINK: LazyLock<RwLock<Option<StreamSink<LogEntry>>>> =
     LazyLock::new(|| RwLock::new(None));
 
 /// Tracing layer which forwards logs to the Dart side
-pub(super) fn layer<S>(tag: &'static str) -> impl Layer<S>
+pub(super) fn layer<S>() -> impl Layer<S>
 where
     S: Subscriber,
     for<'span> S: LookupSpan<'span>,
 {
-    SendToDartLayer { tag }
+    SendToDartLayer {}
 }
 
 pub(crate) fn set_stream_sink(stream_sink: StreamSink<LogEntry>) {
@@ -44,17 +44,14 @@ pub(crate) fn set_stream_sink(stream_sink: StreamSink<LogEntry>) {
     }
 }
 
-struct SendToDartLayer {
-    tag: &'static str,
-}
+struct SendToDartLayer {}
 
 impl SendToDartLayer {
     fn log(&self, level: tracing::Level, target: String, logline: String) {
         let time = Utc::now();
         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
@@ -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()?;
     }