gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix program log filtering (#22133) (#22151)

Browse Source 
(cherry picked from commit c7b0917e1a814429161019497bd03d9bd8378555)

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot] 2022-01-04 21:56:49 +00:00 committed by GitHub
parent 09dbf069e8
commit edfd8c1717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
program-runtime/src/log_collector.rs
View File

@ -43,7 +43,11 @@ impl From<LogCollector> for Vec<String> {
#[macro_export] #[macro_export]
macro_rules! ic_logger_msg { macro_rules! ic_logger_msg {
($log_collector:expr, $message:expr) => { ($log_collector:expr, $message:expr) => {
$crate::log_collector::log::debug!("{}", $message); $crate::log_collector::log::debug!(
target: "solana_runtime::message_processor::stable_log",
"{}",
$message
);
if let Some(log_collector) = $log_collector.as_ref() { if let Some(log_collector) = $log_collector.as_ref() {
if let Ok(mut log_collector) = log_collector.try_borrow_mut() { if let Ok(mut log_collector) = log_collector.try_borrow_mut() {
log_collector.log($message); log_collector.log($message);
@ -51,7 +55,11 @@ macro_rules! ic_logger_msg {
} }
}; };
($log_collector:expr, $fmt:expr, $($arg:tt)*) => { ($log_collector:expr, $fmt:expr, $($arg:tt)*) => {
$crate::log_collector::log::debug!($fmt, $($arg)*); $crate::log_collector::log::debug!(
target: "solana_runtime::message_processor::stable_log",
$fmt,
$($arg)*
);
if let Some(log_collector) = $log_collector.as_ref() { if let Some(log_collector) = $log_collector.as_ref() {
if let Ok(mut log_collector) = log_collector.try_borrow_mut() { if let Ok(mut log_collector) = log_collector.try_borrow_mut() {
log_collector.log(&format!($fmt, $($arg)*)); log_collector.log(&format!($fmt, $($arg)*));