vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 02:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1673 from safing/fix/tauri-logging

Browse source 
[desktop] Move logging to user dir on windows.
This commit is contained in:
Daniel Hååvi 2024-08-30 15:31:22 +02:00 • committed by GitHub
commit e160dfb091
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2053 additions and 1959 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop/tauri/src-tauri/capabilities/default.json
View file

@ -30,6 +30,8 @@
"shell:allow-open", "shell:allow-open",
"notification:default", "notification:default",
"window-state:allow-save-window-state", "window-state:allow-save-window-state",
"window-state:allow-restore-state" "window-state:allow-restore-state",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text"
] ]
} }

2
desktop/tauri/src-tauri/gen/schemas/capabilities.json
View file

@ -1 +1 @@
{"default":{"identifier":"default","description":"Capability for the main window","remote":{"urls":["http://localhost:817"]},"local":true,"windows":["main","splash"],"permissions":["core:path:default","core:event:allow-listen","core:event:allow-unlisten","core:event:allow-emit","core:event:allow-emit-to","core:window:allow-hide","core:window:allow-show","core:window:allow-is-visible","core:window:allow-set-focus","core:window:allow-close","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default","shell:allow-open","notification:default","window-state:allow-save-window-state","window-state:allow-restore-state"]}} {"default":{"identifier":"default","description":"Capability for the main window","remote":{"urls":["http://localhost:817"]},"local":true,"windows":["main","splash"],"permissions":["core:path:default","core:event:allow-listen","core:event:allow-unlisten","core:event:allow-emit","core:event:allow-emit-to","core:window:allow-hide","core:window:allow-show","core:window:allow-is-visible","core:window:allow-set-focus","core:window:allow-close","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default","shell:allow-open","notification:default","window-state:allow-save-window-state","window-state:allow-restore-state","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}

3997
desktop/tauri/src-tauri/gen/schemas/windows-schema.json
View file

File diff suppressed because it is too large Load diff

9
desktop/tauri/src-tauri/src/main.rs
View file

@ -200,6 +200,7 @@ fn main() {
cli.with_notifications = *value; cli.with_notifications = *value;
} }
#[cfg(target_os = "linux")]
let log_target = if let Some(data_dir) = cli.data { let log_target = if let Some(data_dir) = cli.data {
tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Folder { tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Folder {
path: Path::new(&format!("{}/logs/app2", data_dir)).into(), path: Path::new(&format!("{}/logs/app2", data_dir)).into(),
@ -209,6 +210,14 @@ fn main() {
tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Stdout) tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Stdout)
}; };
// TODO(vladimir): Permission for logs/app2 folder are not guaranteed. Use the default location for now.
#[cfg(target_os = "windows")]
let log_target = if let Some(data_dir) = cli.data {
tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::LogDir { file_name: None })
} else {
tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Stdout)
};
let mut log_level = LOG_LEVEL; let mut log_level = LOG_LEVEL;
match cli.log.as_ref() { match cli.log.as_ref() {
"off" => log_level = LevelFilter::Off, "off" => log_level = LevelFilter::Off,