From b5c87e4882a00c5a5fd395c6123bb399872024a5 Mon Sep 17 00:00:00 2001
From: John Smith <jsmith@example.com>
Date: Thu, 1 Dec 2022 16:49:37 -0500
Subject: [PATCH] log fixes

---
 veilid-core/run_tests.sh                           | 3 +++
 veilid-core/src/tests/common/test_veilid_config.rs | 4 ++--
 veilid-core/src/tests/ios/mod.rs                   | 2 +-
 veilid-tools/run_tests.sh                          | 3 +++
 veilid-tools/src/tests/ios/mod.rs                  | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/veilid-core/run_tests.sh b/veilid-core/run_tests.sh
index 7334bec4..0a8ec9af 100755
--- a/veilid-core/run_tests.sh
+++ b/veilid-core/run_tests.sh
@@ -19,7 +19,10 @@ elif [[ "$1" == "ios" ]]; then
 
     # Run in temporary simulator
     xcrun simctl install $ID $SYMROOT/Debug-iphonesimulator/$APPNAME.app
+    xcrun simctl spawn $ID log stream --level debug --predicate "subsystem == \"$BUNDLENAME\"" &
     xcrun simctl launch --console $ID $BUNDLENAME
+    sleep 1 # Ensure the last log lines print
+    kill -INT %1
 
     # Clean up build output
     rm -rf /tmp/testout
diff --git a/veilid-core/src/tests/common/test_veilid_config.rs b/veilid-core/src/tests/common/test_veilid_config.rs
index b7b0db01..3743ca7e 100644
--- a/veilid-core/src/tests/common/test_veilid_config.rs
+++ b/veilid-core/src/tests/common/test_veilid_config.rs
@@ -156,8 +156,8 @@ cfg_if! {
     }
 }
 
-fn update_callback(update: VeilidUpdate) {
-    println!("update_callback: {:?}", update);
+fn update_callback(_update: VeilidUpdate) {
+    // println!("update_callback: {:?}", update);
 }
 
 pub fn setup_veilid_core() -> (UpdateCallback, ConfigCallback) {
diff --git a/veilid-core/src/tests/ios/mod.rs b/veilid-core/src/tests/ios/mod.rs
index 31339981..fe4fc783 100644
--- a/veilid-core/src/tests/ios/mod.rs
+++ b/veilid-core/src/tests/ios/mod.rs
@@ -18,7 +18,7 @@ pub fn veilid_core_setup_ios_tests() {
     // Set up subscriber and layers
     let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Trace, None);
     tracing_subscriber::registry()
-        .with(OsLogger::new("com.veilid.veilidtools-tests", "default").with_filter(filter))
+        .with(OsLogger::new("com.veilid.veilidcore-tests", "").with_filter(filter))
         .init();
 
     panic::set_hook(Box::new(|panic_info| {
diff --git a/veilid-tools/run_tests.sh b/veilid-tools/run_tests.sh
index ad09bb88..de450f39 100755
--- a/veilid-tools/run_tests.sh
+++ b/veilid-tools/run_tests.sh
@@ -19,7 +19,10 @@ elif [[ "$1" == "ios" ]]; then
 
     # Run in temporary simulator
     xcrun simctl install $ID $SYMROOT/Debug-iphonesimulator/$APPNAME.app
+    xcrun simctl spawn $ID log stream --level debug --predicate "subsystem == \"$BUNDLENAME\"" &
     xcrun simctl launch --console $ID $BUNDLENAME
+    sleep 1 # Ensure the last log lines print
+    kill -INT %1
 
     # Clean up build output
     rm -rf /tmp/testout
diff --git a/veilid-tools/src/tests/ios/mod.rs b/veilid-tools/src/tests/ios/mod.rs
index af843827..77534395 100644
--- a/veilid-tools/src/tests/ios/mod.rs
+++ b/veilid-tools/src/tests/ios/mod.rs
@@ -25,12 +25,12 @@ pub fn veilid_tools_setup_ios_tests() {
             tracing_subscriber::registry()
                 .with(filters)
                 .with(filter::LevelFilter::TRACE)
-                .with(OsLogger::new("com.veilid.veilidtools-tests", "default"))
+                .with(OsLogger::new("com.veilid.veilidtools-tests", ""))
                 .init();
         } else {
             use oslog::OsLogger;
 
-            OsLogger::new("com.veilid.veilidtools-tests", "default")
+            OsLogger::new("com.veilid.veilidtools-tests")
                 .level_filter(LevelFilter::Trace)
                 .init()
                 .unwrap();