CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-06 13:53:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(log): use Swift OSLog instead of oslog Rust binding (#262)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2023-02-23 09:17:15 -08:00
committed by GitHub
parent 22f987bf24
commit 961602bd1b
8 changed files with 117 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/log/src/lib.rs
+15 -21
View File
@@ -22,6 +22,11 @@ use tauri::{
pub use fern;
#[cfg(target_os = "ios")]
extern "C" {
fn tauri_log(level: u8, message: &swift_rs::SRString);
}
const DEFAULT_MAX_FILE_SIZE: u128 = 40000;
const DEFAULT_ROTATION_STRATEGY: RotationStrategy = RotationStrategy::KeepOne;
const DEFAULT_LOG_TARGETS: [LogTarget; 2] = [LogTarget::Stdout, LogTarget::LogDir];
@@ -260,29 +265,18 @@ impl Builder {
}
#[cfg(target_os = "ios")]
LogTarget::Stdout | LogTarget::Stderr => {
use std::sync::Mutex;
let loggers: Mutex<HashMap<String, oslog::OsLog>> = Default::default();
let mut subsystem = String::new();
let identifier = &app_handle.config().tauri.bundle.identifier;
let s = identifier.split('.');
let last = s.clone().count() - 1;
for (i, w) in s.enumerate() {
if i != last {
subsystem.push_str(w);
subsystem.push('.');
}
}
subsystem.push_str(&app_handle.package_info().crate_name);
fern::Output::call(move |record| {
let mut loggers = loggers.lock().unwrap();
let pair =
loggers.entry(record.target().into()).or_insert_with(|| {
oslog::OsLog::new(&subsystem, record.target())
});
let message = format!("{}", record.args());
(*pair).with_level(record.level().into(), &message);
unsafe {
tauri_log(
match record.level() {
log::Level::Trace | log::Level::Debug => 1,
log::Level::Info => 2,
log::Level::Warn | log::Level::Error => 3,
},
&message.as_str().into(),
);
}
})
}
#[cfg(desktop)]