logos-blockchain/logos-blockchain-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-testing.git synced 2026-01-04 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make local nodes log to NOMOS_LOG_DIR and allow slower startup

Browse Source
This commit is contained in:
andrussal 2025-12-04 13:34:37 +01:00
parent 933d238eeb
commit 33ed2b7a1c
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
testing-framework/core/src/nodes/executor.rs
View File

@ -37,6 +37,12 @@ fn binary_path() -> PathBuf {
if let Some(path) = which_on_path("nomos-executor") {
return path;
}
// Default to the shared bin staging area; fall back to workspace target.
let shared_bin = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../../testing-framework/assets/stack/bin/nomos-executor");
if shared_bin.exists() {
return shared_bin;
}
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../../")
.join(BIN_PATH)
@ -141,12 +147,22 @@ impl Executor {
let file = std::fs::File::create(&config_path).unwrap();
if !*IS_DEBUG_TRACING {
// setup logging so that we can intercept it later in testing
if let Ok(env_dir) = std::env::var("NOMOS_LOG_DIR") {
let log_dir = PathBuf::from(env_dir);
let _ = std::fs::create_dir_all(&log_dir);
config.tracing.logger = LoggerLayer::File(FileConfig {
directory: log_dir,
prefix: Some(LOGS_PREFIX.into()),
});
} else {
// If no explicit log dir is provided, fall back to a tempdir so we can capture
// logs.
config.tracing.logger = LoggerLayer::File(FileConfig {
directory: dir.path().to_owned(),
prefix: Some(LOGS_PREFIX.into()),
});
}
}
config.storage.db_path = dir.path().join("db");
dir.path().clone_into(
@ -174,7 +190,7 @@ impl Executor {
config,
api: ApiClient::new(addr, Some(testing_addr)),
};
tokio::time::timeout(adjust_timeout(Duration::from_secs(10)), async {
tokio::time::timeout(adjust_timeout(Duration::from_secs(30)), async {
node.wait_online().await;
})
.await

20
testing-framework/core/src/nodes/validator.rs
View File

@ -36,6 +36,12 @@ fn binary_path() -> PathBuf {
if let Some(path) = which_on_path("nomos-node") {
return path;
}
// Default to the shared bin staging area; fall back to workspace target.
let shared_bin = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../../testing-framework/assets/stack/bin/nomos-node");
if shared_bin.exists() {
return shared_bin;
}
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../../")
.join(BIN_PATH)
@ -168,12 +174,22 @@ impl Validator {
let file = std::fs::File::create(&config_path).unwrap();
if !*IS_DEBUG_TRACING {
// setup logging so that we can intercept it later in testing
if let Ok(env_dir) = std::env::var("NOMOS_LOG_DIR") {
let log_dir = PathBuf::from(env_dir);
let _ = std::fs::create_dir_all(&log_dir);
config.tracing.logger = LoggerLayer::File(FileConfig {
directory: log_dir,
prefix: Some(LOGS_PREFIX.into()),
});
} else {
// If no explicit log dir is provided, fall back to a tempdir so we can capture
// logs.
config.tracing.logger = LoggerLayer::File(FileConfig {
directory: dir.path().to_owned(),
prefix: Some(LOGS_PREFIX.into()),
});
}
}
config.storage.db_path = dir.path().join("db");
dir.path().clone_into(
@ -203,7 +219,7 @@ impl Validator {
api: ApiClient::new(addr, Some(testing_addr)),
};
tokio::time::timeout(adjust_timeout(Duration::from_secs(10)), async {
tokio::time::timeout(adjust_timeout(Duration::from_secs(30)), async {
node.wait_online().await;
})
.await?;