Skip to content

Commit

Permalink
Merge branch 'main' into enha-consensus-envs
Browse files Browse the repository at this point in the history
  • Loading branch information
gabriel-aranha-cw authored Jun 10, 2024
2 parents 6eea86b + 7dd63ae commit 5814e21
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub struct CommonConfig {
#[arg(long = "blocking-threads", env = "BLOCKING_THREADS", default_value = "10")]
pub num_blocking_threads: usize,

// Address where Prometheus metrics will be exposed.
/// Address where Prometheus metrics will be exposed.
#[arg(long = "metrics-exporter-address", env = "METRICS_EXPORTER_ADDRESS", default_value = "0.0.0.0:9000")]
pub metrics_exporter_address: SocketAddr,

Expand Down Expand Up @@ -898,19 +898,24 @@ impl FromStr for PermanentStorageKind {
// Enum: LogFormat
// -----------------------------------------------------------------------------

/// Tracing event log format.
#[derive(DebugAsJson, strum::Display, Clone, Copy, Eq, PartialEq, serde::Serialize)]
pub enum LogFormat {
#[strum(to_string = "json")]
Json,

/// Minimal format: Time (no date), level, and message.
#[strum(to_string = "minimal")]
Minimal,

/// Normal format: Default `tracing` crate configuration.
#[strum(to_string = "normal")]
Normal,

/// Verbose format: Full datetime, level, thread, target, and message.
#[strum(to_string = "verbose")]
Verbose,

/// JSON format: Verbose information formatted as JSON.
#[strum(to_string = "json")]
Json,
}

impl FromStr for LogFormat {
Expand Down

0 comments on commit 5814e21

Please sign in to comment.