From edcd4a9c5bf34c38a533df7c72882ed5e0c8629f Mon Sep 17 00:00:00 2001 From: Kim Altintop Date: Wed, 9 Aug 2023 12:43:45 +0200 Subject: [PATCH 1/2] sdk: Lower client cache log severities In particular, avoid logging entire rows above `trace`. --- crates/sdk/src/client_cache.rs | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/crates/sdk/src/client_cache.rs b/crates/sdk/src/client_cache.rs index 27517d2b10..ce8fa35b78 100644 --- a/crates/sdk/src/client_cache.rs +++ b/crates/sdk/src/client_cache.rs @@ -7,6 +7,7 @@ use anymap::{ Map, }; use im::HashMap; +use log::log_enabled; use spacetimedb_sats::bsatn; use std::collections::HashMap as StdHashMap; use std::sync::Arc; @@ -115,10 +116,10 @@ impl TableCache { } Ok(value) => { if op_is_delete(op) { - log::info!("Got delete event for {:?} row {:?}", T::TABLE_NAME, value,); + log::debug!("Got delete event for {:?} row {:?}", T::TABLE_NAME, value,); self.delete(callbacks, row_pk, value); } else if op_is_insert(op) { - log::info!("Got insert event for {:?} row {:?}", T::TABLE_NAME, value,); + log::debug!("Got insert event for {:?} row {:?}", T::TABLE_NAME, value,); self.insert(callbacks, row_pk, value); } else { log::error!("Unknown table_row_operation::OperationType {}", op); @@ -238,7 +239,11 @@ impl TableCache { ); } Ok(row) => { - log::info!("Initializing table {:?}: got new row {:?}", T::TABLE_NAME, row); + if log_enabled!(log::Level::Trace) { + log::trace!("Initializing table {:?}: got new row {:?}", T::TABLE_NAME, row); + } else { + log::debug!("Initializing table {:?} with new row", T::TABLE_NAME); + } diff.insert(row_pk, DiffEntry::Insert(row)); } }, @@ -247,7 +252,11 @@ impl TableCache { diff.insert(row_pk, diff_entry); } Some(DiffEntry::Delete(row)) => { - log::info!("Initializing table {:?}: row {:?} remains present", T::TABLE_NAME, row); + if log_enabled!(log::Level::Trace) { + log::trace!("Initializing table {:?}: row {:?} remains present", T::TABLE_NAME, row); + } else { + log::debug!("Initializing table {:?} with row remaining present", T::TABLE_NAME); + } diff.insert(row_pk, DiffEntry::NoChange(row)); } }; @@ -350,10 +359,18 @@ impl TableCache { } Ok(row) => { if op_is_delete(op) { - log::info!("Got delete event for {:?} row {:?}", T::TABLE_NAME, row,); + if log_enabled!(log::Level::Trace) { + log::trace!("Got delete event for {:?} row {:?}", T::TABLE_NAME, row,); + } else { + log::debug!("Got delete event for {:?}", T::TABLE_NAME); + } Some(DiffEntry::Delete(row_pk, row)) } else if op_is_insert(op) { - log::info!("Got insert event for {:?} row {:?}", T::TABLE_NAME, row,); + if log_enabled!(log::Level::Trace) { + log::trace!("Got insert event for {:?} row {:?}", T::TABLE_NAME, row,); + } else { + log::debug!("Got insert event for {:?}", T::TABLE_NAME); + } Some(DiffEntry::Insert(row_pk, row)) } else { log::error!("Unknown table_row_operation::OperationType {}", op); From c8d55d6097bc8c4fb2aa2f9c8bf9405588a223e7 Mon Sep 17 00:00:00 2001 From: Kim Altintop Date: Wed, 9 Aug 2023 23:18:12 +0200 Subject: [PATCH 2/2] fixup! sdk: Lower client cache log severities --- crates/sdk/src/client_cache.rs | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/crates/sdk/src/client_cache.rs b/crates/sdk/src/client_cache.rs index ce8fa35b78..bbc94bfe82 100644 --- a/crates/sdk/src/client_cache.rs +++ b/crates/sdk/src/client_cache.rs @@ -7,7 +7,6 @@ use anymap::{ Map, }; use im::HashMap; -use log::log_enabled; use spacetimedb_sats::bsatn; use std::collections::HashMap as StdHashMap; use std::sync::Arc; @@ -116,10 +115,10 @@ impl TableCache { } Ok(value) => { if op_is_delete(op) { - log::debug!("Got delete event for {:?} row {:?}", T::TABLE_NAME, value,); + log::trace!("Got delete event for {:?} row {:?}", T::TABLE_NAME, value,); self.delete(callbacks, row_pk, value); } else if op_is_insert(op) { - log::debug!("Got insert event for {:?} row {:?}", T::TABLE_NAME, value,); + log::trace!("Got insert event for {:?} row {:?}", T::TABLE_NAME, value,); self.insert(callbacks, row_pk, value); } else { log::error!("Unknown table_row_operation::OperationType {}", op); @@ -239,11 +238,7 @@ impl TableCache { ); } Ok(row) => { - if log_enabled!(log::Level::Trace) { - log::trace!("Initializing table {:?}: got new row {:?}", T::TABLE_NAME, row); - } else { - log::debug!("Initializing table {:?} with new row", T::TABLE_NAME); - } + log::trace!("Initializing table {:?}: got new row {:?}", T::TABLE_NAME, row); diff.insert(row_pk, DiffEntry::Insert(row)); } }, @@ -252,11 +247,7 @@ impl TableCache { diff.insert(row_pk, diff_entry); } Some(DiffEntry::Delete(row)) => { - if log_enabled!(log::Level::Trace) { - log::trace!("Initializing table {:?}: row {:?} remains present", T::TABLE_NAME, row); - } else { - log::debug!("Initializing table {:?} with row remaining present", T::TABLE_NAME); - } + log::trace!("Initializing table {:?}: row {:?} remains present", T::TABLE_NAME, row); diff.insert(row_pk, DiffEntry::NoChange(row)); } }; @@ -359,18 +350,10 @@ impl TableCache { } Ok(row) => { if op_is_delete(op) { - if log_enabled!(log::Level::Trace) { - log::trace!("Got delete event for {:?} row {:?}", T::TABLE_NAME, row,); - } else { - log::debug!("Got delete event for {:?}", T::TABLE_NAME); - } + log::trace!("Got delete event for {:?} row {:?}", T::TABLE_NAME, row,); Some(DiffEntry::Delete(row_pk, row)) } else if op_is_insert(op) { - if log_enabled!(log::Level::Trace) { - log::trace!("Got insert event for {:?} row {:?}", T::TABLE_NAME, row,); - } else { - log::debug!("Got insert event for {:?}", T::TABLE_NAME); - } + log::trace!("Got insert event for {:?} row {:?}", T::TABLE_NAME, row,); Some(DiffEntry::Insert(row_pk, row)) } else { log::error!("Unknown table_row_operation::OperationType {}", op);