Skip to content

Commit

Permalink
nit
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThreeHrSleep
ThreeHrSleep committed Oct 12, 2024
1 parent 9f0da68 commit 3314eba
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 254 deletions.
1 change: 1 addition & 0 deletions beacon_node/beacon_chain/src/beacon_block_streamer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use types::{
ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadElectra,
ExecutionPayloadHeader,
};

#[derive(PartialEq)]
pub enum CheckCaches {
Yes,
Expand Down
255 changes: 3 additions & 252 deletions common/logging/src/macros.rs
View file
Original file line number Diff line number Diff line change
@@ -1,255 +1,6 @@
#[macro_export]
macro_rules! crit {
// Name / target / parent.
(name: $name:expr, target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
tracing::event!(name: $name, target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", $($field)* }, $($arg)*)
);
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", $($k).+ $($field)* })
);
(name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", ?$($k).+ $($field)* })
);
(name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", %$($k).+ $($field)* })
);
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
tracing::event!(name: $name, target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit" }, $($arg)+)
);

// Name / target.
(name: $name:expr, target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
tracing::event!(name: $name, target: $target, tracing::Level::ERROR, { error_type = "crit", $($field)* }, $($arg)*)
);
(name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, target: $target, tracing::Level::ERROR, { error_type = "crit", $($k).+ $($field)* })
);
(name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, target: $target, tracing::Level::ERROR, { error_type = "crit", ?$($k).+ $($field)* })
);
(name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, target: $target, tracing::Level::ERROR, { error_type = "crit", %$($k).+ $($field)* })
);
(name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
tracing::event!(name: $name, target: $target, tracing::Level::ERROR, { error_type = "crit" }, $($arg)+)
);

// Target / parent.
(target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
tracing::event!(target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", $($field)* }, $($arg)*)
);
(target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
tracing::event!(target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", $($k).+ $($field)* })
);
(target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
tracing::event!(target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", ?$($k).+ $($field)* })
);
(target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
tracing::event!(target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit", %$($k).+ $($field)* })
);
(target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
tracing::event!(target: $target, parent: $parent, tracing::Level::ERROR, { error_type = "crit" }, $($arg)+)
);

// Name / parent.
(name: $name:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
tracing::event!(name: $name, parent: $parent, tracing::Level::ERROR, { error_type = "crit", $($field)* }, $($arg)*)
);
(name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, parent: $parent, tracing::Level::ERROR, { error_type = "crit", $($k).+ $($field)* })
);
(name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, parent: $parent, tracing::Level::ERROR, { error_type = "crit", ?$($k).+ $($field)* })
);
(name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, parent: $parent, tracing::Level::ERROR, { error_type = "crit", %$($k).+ $($field)* })
);
(name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
tracing::event!(name: $name, parent: $parent, tracing::Level::ERROR, { error_type = "crit" }, $($arg)+)
);

// Name.
(name: $name:expr, { $($field:tt)* }, $($arg:tt)* ) => (
tracing::event!(name: $name, tracing::Level::ERROR, { error_type = "crit",$($field)* }, $($arg)*)
);
(name: $name:expr, $($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, tracing::Level::ERROR, {error_type = "crit", $($k).+ $($field)* })
);
(name: $name:expr, ?$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, tracing::Level::ERROR, { error_type = "crit",?$($k).+ $($field)* })
);
(name: $name:expr, %$($k:ident).+ $($field:tt)* ) => (
tracing::event!(name: $name, tracing::Level::ERROR, { error_type = "crit",%$($k).+ $($field)* })
);
(name: $name:expr, $($arg:tt)+ ) => (
tracing::event!(name: $name, tracing::Level::ERROR, {error_type = "crit"}, $($arg)+)
);

// Target.
(target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
tracing::event!(target: $target, tracing::Level::ERROR, { error_type = "crit",$($field)* }, $($arg)*)
);
(target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
tracing::event!(target: $target, tracing::Level::ERROR, { error_type = "crit",$($k).+ $($field)* })
);
(target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
tracing::event!(target: $target, tracing::Level::ERROR, {error_type = "crit", ?$($k).+ $($field)* })
);
(target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
tracing::event!(target: $target, tracing::Level::ERROR, {error_type = "crit", %$($k).+ $($field)* })
);
(target: $target:expr, $($arg:tt)+ ) => (
tracing::event!(target: $target, tracing::Level::ERROR, {error_type = "crit"}, $($arg)+)
);

// Parent.
(parent: $parent:expr, { $($field:tt)+ }, $($arg:tt)+ ) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", $($field)+ },
$($arg)+
)
);
(parent: $parent:expr, $($k:ident).+ = $($field:tt)*) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", $($k).+ = $($field)* }
)
);
(parent: $parent:expr, ?$($k:ident).+ = $($field:tt)*) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", ?$($k).+ = $($field)* }
)
);
(parent: $parent:expr, %$($k:ident).+ = $($field:tt)*) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", %$($k).+ = $($field)* }
)
);
(parent: $parent:expr, $($k:ident).+, $($field:tt)*) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", $($k).+, $($field)* }
)
);
(parent: $parent:expr, ?$($k:ident).+, $($field:tt)*) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", ?$($k).+, $($field)* }
)
);
(parent: $parent:expr, %$($k:ident).+, $($field:tt)*) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit", %$($k).+, $($field)* }
)
);
(parent: $parent:expr, $($arg:tt)+) => (
tracing::event!(
target: module_path!(),
parent: $parent,
tracing::Level::ERROR,
{ error_type = "crit" },
$($arg)+
)
);


({ $($field:tt)+ }, $($arg:tt)+ ) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", $($field)+ },
$($arg)+
)
);
($($k:ident).+ = $($field:tt)*) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", $($k).+ = $($field)* }
)
);
(?$($k:ident).+ = $($field:tt)*) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", ?$($k).+ = $($field)* }
)
);
(%$($k:ident).+ = $($field:tt)*) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", %$($k).+ = $($field)* }
)
);
($($k:ident).+, $($field:tt)*) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", $($k).+, $($field)* }
)
);
(?$($k:ident).+, $($field:tt)*) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", ?$($k).+, $($field)* }
)
);
(%$($k:ident).+, $($field:tt)*) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", %$($k).+, $($field)* }
)
);
(?$($k:ident).+) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", ?$($k).+ }
)
);
(%$($k:ident).+) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", %$($k).+ }
)
);
($($k:ident).+) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit", $($k).+ }
)
);

($($arg:tt)+) => (
tracing::event!(
target: module_path!(),
tracing::Level::ERROR,
{ error_type = "crit" },
$($arg)+
)
);

($($arg:tt)*) => {
tracing::error!(error_type = "crit", $($arg)*);
};
}
18 changes: 16 additions & 2 deletions common/logging/src/tracing_logging_layer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,24 @@ where
}
};

let fixed_message_width = 44;
let bold_start = "\x1b[1m";
let bold_end = "\x1b[0m";

let bold_message = format!("{}{}{}", bold_start, visitor.message, bold_end);

let message_len = visitor.message.len();

let padded_message = if message_len < fixed_message_width {
format!(
"{:<width$}",
bold_message,
width = fixed_message_width + (bold_message.len() - message_len)
)
} else {
bold_message.clone()
};

let mut formatted_fields = String::new();
for (i, (field_name, field_value)) in visitor.fields.iter().enumerate() {
if i > 0 {
Expand All @@ -55,9 +69,9 @@ where
formatted_fields.push_str(&formatted_field);
}

let mut full_message = bold_message;
let mut full_message = padded_message.clone();
if !formatted_fields.is_empty() {
full_message = format!("{}\t\t{}", full_message, formatted_fields);
full_message = format!("{} {}", padded_message, formatted_fields);
}

let message = format!("{} {} {}\n", timestamp, level_str, full_message);
Expand Down

0 comments on commit 3314eba

Please sign in to comment.