fix(nsis): should not stop verge service while updating

fix: build issues
libnyanpasu · Feb 25, 2024 · 36abd6f · 36abd6f
1 parent 791baa5
commit 36abd6f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
@@ -114,7 +114,7 @@ jobs:
           releaseDraft: false
           prerelease: true
           tauriScript: pnpm tauri
-          args: -f default-meta nightly -c ./backend/tauri/tauri.nightly.conf.json
+          args: -f deadlock-detection nightly -c ./backend/tauri/tauri.nightly.conf.json
       - name: Portable Bundle (Windows Only)
         if: startsWith(matrix.targets.os, 'windows-') && matrix.targets.category == 'nsis'
         run: |

diff --git a/backend/tauri/src/utils/init/logging.rs b/backend/tauri/src/utils/init/logging.rs
@@ -117,29 +117,18 @@ pub fn init() -> Result<()> {
     });
 
     // if debug build, log to stdout and stderr with all levels
-    let terminal_layer = {
-        #[cfg(debug_assertions)]
-        {
-            Some(
-                fmt::Layer::new()
-                    .with_ansi(std::io::stdout().is_terminal())
-                    .compact()
-                    .with_target(false)
-                    .with_file(true)
-                    .with_line_number(true)
-                    .with_writer(std::io::stdout),
-            )
-        }
-        #[cfg(not(debug_assertions))]
-        {
-            None
-        }
-    };
+    #[cfg(debug_assertions)]
+    let terminal_layer = fmt::Layer::new()
+        .with_ansi(std::io::stdout().is_terminal())
+        .compact()
+        .with_target(false)
+        .with_file(true)
+        .with_line_number(true)
+        .with_writer(std::io::stdout);
 
-    let subscriber = tracing_subscriber::registry()
-        .with(filter)
-        .with(file_layer)
-        .with(terminal_layer);
+    let subscriber = tracing_subscriber::registry().with(filter).with(file_layer);
+    #[cfg(debug_assertions)]
+    let subscriber = subscriber.with(terminal_layer);
 
     tracing::subscriber::set_global_default(subscriber)
         .map_err(|x| anyhow!("setup logging error: {}", x))?;

diff --git a/backend/tauri/templates/installer.nsi b/backend/tauri/templates/installer.nsi
@@ -459,7 +459,7 @@ FunctionEnd
 
 !macro CheckAllNyanpasuProcesses
   !insertmacro CheckNyanpasuProcess "Clash Nyanpasu.exe" "1"
-  !insertmacro CheckNyanpasuProcess "clash-verge-service.exe" "2"
+  ; !insertmacro CheckNyanpasuProcess "clash-verge-service.exe" "2"
   !insertmacro CheckNyanpasuProcess "clash.exe" "3"
   !insertmacro CheckNyanpasuProcess "clash-rs.exe" "4"
   !insertmacro CheckNyanpasuProcess "mihomo.exe" "5"