mirror of
https://github.com/serai-dex/serai.git
synced 2024-11-17 01:17:36 +00:00
Set better logging defaults for Docker tests
This commit is contained in:
parent
713660c79c
commit
8e6e05ae2d
2 changed files with 13 additions and 15 deletions
|
@ -117,16 +117,18 @@ pub fn build(name: String) {
|
|||
|
||||
println!("Building {}...", &name);
|
||||
|
||||
assert!(Command::new("docker")
|
||||
let res = Command::new("docker")
|
||||
.current_dir(deploy_path)
|
||||
.arg("compose")
|
||||
.arg("build")
|
||||
.arg(&name)
|
||||
.spawn()
|
||||
.unwrap()
|
||||
.wait()
|
||||
.unwrap()
|
||||
.success());
|
||||
.output()
|
||||
.unwrap();
|
||||
if !res.status.success() {
|
||||
dbg!(res.stdout);
|
||||
dbg!(res.stderr);
|
||||
panic!("failed to build {name}");
|
||||
}
|
||||
|
||||
println!("Built!");
|
||||
|
||||
|
|
|
@ -15,14 +15,6 @@ const RPC_PASS: &str = "seraidex";
|
|||
|
||||
static UNIQUE_ID: OnceLock<Mutex<u16>> = OnceLock::new();
|
||||
|
||||
fn log_options() -> Option<LogOptions> {
|
||||
Some(LogOptions {
|
||||
action: LogAction::Forward,
|
||||
policy: LogPolicy::Always,
|
||||
source: LogSource::Both,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn bitcoin_instance() -> (Composition, u16) {
|
||||
serai_docker_tests::build("bitcoin".to_string());
|
||||
|
||||
|
@ -142,7 +134,11 @@ pub fn processor_stack(
|
|||
composition
|
||||
.with_start_policy(StartPolicy::Strict)
|
||||
.with_container_name(format!("{handle}-{}", &unique_id))
|
||||
.with_log_options(log_options()),
|
||||
.with_log_options(Some(LogOptions {
|
||||
action: LogAction::Forward,
|
||||
policy: if handle.contains("processor") { LogPolicy::Always } else { LogPolicy::OnError },
|
||||
source: LogSource::Both,
|
||||
})),
|
||||
);
|
||||
handles.push(compositions.last().unwrap().handle());
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue