apply logging to veilid-flutter, fix jvm version

This commit is contained in:
Christien Rioux 2025-02-18 20:56:03 -05:00
parent 3ff8942370
commit d109780092
3 changed files with 8 additions and 2 deletions

View File

@ -38,7 +38,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '17'
} }
sourceSets { sourceSets {

View File

@ -31,7 +31,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '17'
} }
sourceSets { sourceSets {

View File

@ -233,6 +233,9 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
let mut layers = Vec::new(); let mut layers = Vec::new();
let mut filters = (*FILTERS).lock(); let mut filters = (*FILTERS).lock();
let mut fields_to_strip = HashSet::<&'static str>::new();
fields_to_strip.insert(veilid_core::VEILID_LOG_KEY_FIELD);
// Terminal logger // Terminal logger
if platform_config.logging.terminal.enabled { if platform_config.logging.terminal.enabled {
cfg_if! { cfg_if! {
@ -240,6 +243,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
let filter = let filter =
veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None); veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None);
let layer = paranoid_android::layer("veilid-flutter") let layer = paranoid_android::layer("veilid-flutter")
.map_fmt_fields(|f| veilid_core::FmtStripFields::new(f, fields_to_strip.clone()))
.with_ansi(false) .with_ansi(false)
.with_filter(filter.clone()); .with_filter(filter.clone());
filters.insert("terminal", filter); filters.insert("terminal", filter);
@ -249,6 +253,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None); veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None);
let layer = tracing_subscriber::fmt::Layer::new() let layer = tracing_subscriber::fmt::Layer::new()
.compact() .compact()
.map_fmt_fields(|f| veilid_core::FmtStripFields::new(f, fields_to_strip.clone()))
.with_ansi(false) .with_ansi(false)
.with_writer(std::io::stdout) .with_writer(std::io::stdout)
.with_filter(filter.clone()); .with_filter(filter.clone());
@ -259,6 +264,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None); veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None);
let layer = tracing_subscriber::fmt::Layer::new() let layer = tracing_subscriber::fmt::Layer::new()
.compact() .compact()
.map_fmt_fields(|f| veilid_core::FmtStripFields::new(f, fields_to_strip.clone()))
.with_writer(std::io::stdout) .with_writer(std::io::stdout)
.with_filter(filter.clone()); .with_filter(filter.clone());
filters.insert("terminal", filter); filters.insert("terminal", filter);