|
@ -164,6 +164,7 @@ where |
|
|
resource,
|
|
|
resource,
|
|
|
location_prereqs_did_run
|
|
|
location_prereqs_did_run
|
|
|
);
|
|
|
);
|
|
|
|
|
|
|
|
|
trace!(logger, "Adding implementation prereqs for {:?}", resource);
|
|
|
trace!(logger, "Adding implementation prereqs for {:?}", resource);
|
|
|
let impl_prereq_logger = Rc::new(logger.new(o!("prereq" => "implementation")));
|
|
|
let impl_prereq_logger = Rc::new(logger.new(o!("prereq" => "implementation")));
|
|
|
let (prereqs, prereqs_did_run) = setup
|
|
|
let (prereqs, prereqs_did_run) = setup
|
|
@ -175,22 +176,19 @@ where |
|
|
resource,
|
|
|
resource,
|
|
|
prereqs_did_run
|
|
|
prereqs_did_run
|
|
|
);
|
|
|
);
|
|
|
|
|
|
|
|
|
trace!(logger, "Running implementation for {:?}", resource);
|
|
|
trace!(logger, "Running implementation for {:?}", resource);
|
|
|
let implementation = B::create(resource, &location, prereqs);
|
|
|
let implementation = B::create(resource, &location, prereqs);
|
|
|
let did_run_result = implementation
|
|
|
|
|
|
|
|
|
let did_run = implementation
|
|
|
.run(
|
|
|
.run(
|
|
|
&self.symbol_runner,
|
|
|
&self.symbol_runner,
|
|
|
logger,
|
|
|
logger,
|
|
|
force_run || location_prereqs_did_run || prereqs_did_run,
|
|
|
force_run || location_prereqs_did_run || prereqs_did_run,
|
|
|
)
|
|
|
)
|
|
|
.await;
|
|
|
|
|
|
match did_run_result {
|
|
|
|
|
|
Ok(did_run) => {
|
|
|
|
|
|
debug!(logger, "done.");
|
|
|
|
|
|
Ok((location, did_run))
|
|
|
|
|
|
}
|
|
|
|
|
|
Err(e) => Err(e),
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
.await?;
|
|
|
|
|
|
debug!(logger, "done.");
|
|
|
|
|
|
|
|
|
|
|
|
Ok((location, did_run))
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|