final fixes

Author: Brendonovich

.github/workflows/publish.yml

@@ -221,21 +221,21 @@ jobs:
 
       - name: Upload debug symbols to Sentry
         if: ${{ runner.os == 'macOS' }}
+        shell: bash
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        working-directory: target
         run: |
           curl -sL https://sentry.io/get-cli/ | bash
-          sentry-cli debug-files upload -o ${{ env.SENTRY_ORG }} -p ${{ env.SENTRY_PROJECT }} Cap.dSYM
+          sentry-cli debug-files upload -o ${{ env.SENTRY_ORG }} -p ${{ env.SENTRY_PROJECT }} target/Cap.dSYM
 
       - name: Upload debug symbols to Sentry
         if: ${{ runner.os == 'Windows' }}
+        shell: bash
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        working-directory: target
         run: |
           curl -sL https://sentry.io/get-cli/ | bash
-          sentry-cli debug-files upload -o ${{ env.SENTRY_ORG }} -p ${{ env.SENTRY_PROJECT }} release/cap_desktop.pdb
+          sentry-cli debug-files upload -o ${{ env.SENTRY_ORG }} -p ${{ env.SENTRY_PROJECT }} target/${{ matrix.settings.target }}/release/cap_desktop.pdb
 
   done:
     needs: [draft, build]

apps/desktop/src-tauri/src/main.rs

@@ -14,7 +14,7 @@ fn main() {
     }
 
     // We have to hold onto the ClientInitGuard until the very end
-    let _guard = std::option_env!("CAP_DESKTOP_SENTRY_URL").map(|url| {
+    let _sentry_guard = std::option_env!("CAP_DESKTOP_SENTRY_URL").map(|url| {
         let sentry_client = sentry::init((
             url,
             sentry::ClientOptions {
@@ -48,8 +48,6 @@ fn main() {
 
         (sentry_client, _guard)
     });
-    // Keep the guard alive for the duration of the program
-    std::mem::forget(_guard);
 
     let (layer, handle) = tracing_subscriber::reload::Layer::new(None::<DynLoggingLayer>);
 
@@ -75,9 +73,7 @@ fn main() {
     });
 
     let file_appender = tracing_appender::rolling::daily(&logs_dir, "cap-desktop.log");
-    let (non_blocking, _guard) = tracing_appender::non_blocking(file_appender);
-    // Keep the guard alive for the duration of the program
-    std::mem::forget(_guard);
+    let (non_blocking, _logger_guard) = tracing_appender::non_blocking(file_appender);
 
     let registry = tracing_subscriber::registry().with(tracing_subscriber::filter::filter_fn(
         (|v| v.target().starts_with("cap_")) as fn(&tracing::Metadata) -> bool,