From 438f0bb6506a7579043a917ee548daca2076b9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Cie=C5=9Blak?= Date: Tue, 6 May 2025 17:07:51 +0200 Subject: [PATCH] Remove comments from Info.plist (#54560) When running the `tsh-version` target as a part of `make full`, `build.assets/tooling/cmd/update-plist-version/main.go` parses Info.plist files and updates the version in them, discarding any comments. --- build.assets/macos/tsh/tsh.app/Contents/Info.plist | 3 --- build.assets/macos/tshdev/README.md | 7 +++++++ build.assets/macos/tshdev/tsh.app/Contents/Info.plist | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.assets/macos/tsh/tsh.app/Contents/Info.plist b/build.assets/macos/tsh/tsh.app/Contents/Info.plist index 909d6c4b50c..3b35b688471 100644 --- a/build.assets/macos/tsh/tsh.app/Contents/Info.plist +++ b/build.assets/macos/tsh/tsh.app/Contents/Info.plist @@ -52,9 +52,6 @@ NSApplication OSLogPreferences - com.gravitational.teleport.tsh.vnetd DEFAULT-OPTIONS diff --git a/build.assets/macos/tshdev/README.md b/build.assets/macos/tshdev/README.md index c2b82452c37..6b029c15600 100644 --- a/build.assets/macos/tshdev/README.md +++ b/build.assets/macos/tshdev/README.md @@ -211,3 +211,10 @@ tail -f /var/log/com.apple.xpc.launchd/launchd.log Capturing logs in Console.app might be useful too. However, the logs from launchd were sufficient for any debugging we had to do so far. + +## `OSLogPreferences` in `Info.plist` + +VNet sends its logs to os_log as `com.goteleport.tshdev.vnetd` +(`com.gravitational.teleport.tsh.vnetd` in official releases). By default only warn level+ logs are +visible and persisted on disk. The settings in `OSLogPreferences` make sure that os_log persists +info logs to disk too, but only for VNet and not for tsh invocations with the `--os-log` flag. diff --git a/build.assets/macos/tshdev/tsh.app/Contents/Info.plist b/build.assets/macos/tshdev/tsh.app/Contents/Info.plist index f1af3749892..0383531e729 100644 --- a/build.assets/macos/tshdev/tsh.app/Contents/Info.plist +++ b/build.assets/macos/tshdev/tsh.app/Contents/Info.plist @@ -50,9 +50,6 @@ NSApplication OSLogPreferences - com.goteleport.tshdev.vnetd DEFAULT-OPTIONS