Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dynamic log optional #171

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Dynamic log optional #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions crates/rbuilder/src/live_builder/base_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ pub struct BaseConfig {
pub log_json: bool,
log_level: EnvOrValue<String>,
pub log_color: bool,
/// Enables dynamic logging (saving logs to a file)
pub log_enable_dynamic: bool,

pub error_storage_path: Option<PathBuf>,

Expand Down Expand Up @@ -389,6 +391,7 @@ impl Default for BaseConfig {
log_json: false,
log_level: "info".into(),
log_color: false,
log_enable_dynamic: false,
error_storage_path: None,
coinbase_secret_key: "".into(),
flashbots_db: None,
Expand Down
1 change: 1 addition & 0 deletions crates/rbuilder/src/live_builder/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ pub async fn run<ConfigType: LiveBuilderConfig>(
telemetry::servers::full::spawn(
config.base_config().full_telemetry_server_address(),
config.version_for_telemetry(),
config.base_config().log_enable_dynamic,
)
.await?;
let builder = config.create_builder(cancel.clone()).await?;
Expand Down
23 changes: 14 additions & 9 deletions crates/rbuilder/src/telemetry/servers/full.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,25 @@ use crate::{
utils::build_info::Version,
};

pub async fn spawn(addr: SocketAddr, version: Version) -> eyre::Result<()> {
pub async fn spawn(
addr: SocketAddr,
version: Version,
enable_dynamic_log: bool,
) -> eyre::Result<()> {
set_version(version);

// metrics over /debug/metrics/prometheus
let metrics_route = warp::path!("debug" / "metrics" / "prometheus").and_then(metrics_handler);

let log_set_route = warp::path!("debug" / "log" / "set" / String)
.and(warp::query::<LogQuery>())
.and_then(set_rust_log_handle);
let log_reset_route = warp::path!("debug" / "log" / "reset").and_then(reset_log_handle);

let route = metrics_route.or(log_set_route).or(log_reset_route);

tokio::spawn(warp::serve(route).run(addr));
if enable_dynamic_log {
let log_set_route = warp::path!("debug" / "log" / "set" / String)
.and(warp::query::<LogQuery>())
.and_then(set_rust_log_handle);
let log_reset_route = warp::path!("debug" / "log" / "reset").and_then(reset_log_handle);
tokio::spawn(warp::serve(metrics_route.or(log_set_route).or(log_reset_route)).run(addr));
} else {
tokio::spawn(warp::serve(metrics_route).run(addr));
}

Ok(())
}
Expand Down
Loading