Some small fixes

This commit is contained in:
Adrian Heine 2020-09-03 11:31:09 +02:00
parent d173198729
commit 42690f1d50
7 changed files with 46 additions and 24 deletions

View file

@ -137,7 +137,7 @@ where
let resource = resource.as_ref();
let logger = StoringLogger::new();
logger.write(4, format!("Adding {:?} ... ", resource));
let result = {
let result = async {
logger.trace(format!(" (force_run is {})", force_run));
let (location, location_prereqs) = L::locate(resource);
logger.trace(format!("Adding location prereqs for {:?}", resource));
@ -162,7 +162,8 @@ where
)
.await?;
Ok((location, did_run))
};
}
.await;
logger.write(4, "done.");
let max_level = if result.is_err() { 5 } else { 3 };
if parent_logger.put(logger.release().into_iter().filter(|e| e.0 <= max_level)) == 0 {
@ -181,9 +182,9 @@ impl<SR: SymbolRunner, L, B> SymbolRunner for RegularSetupCore<SR, L, B> {
force: bool,
) -> Result<bool, Box<dyn Error>> {
let logger = StoringLogger::new();
logger.debug(format!("Directly running {:?} ...", symbol));
logger.write(4, format!("Directly running {:?} ...", symbol));
let result = self.symbol_runner.run_symbol(symbol, &logger, force).await;
logger.debug("done.");
logger.write(4, "done.");
let max_level = if result.is_err() { 5 } else { 3 };
parent_logger.put(logger.release().into_iter().filter(|e| e.0 <= max_level));
result

View file

@ -64,11 +64,7 @@ impl<
self.0.resources.borrow_mut()
}
pub async fn add_force<R: AddableResource>(
&self,
resource: R,
force_run: bool,
) -> AddResult<R>
pub async fn add_force<R: AddableResource>(&self, resource: R, force_run: bool) -> AddResult<R>
where
Rs: FromResource<R>,
As: FromArtifact<R> + Clone,
@ -126,7 +122,11 @@ impl<
self.add_force(resource, false).await
}
pub async fn run_symbol<S: Runnable>(&self, symbol: S, force: bool) -> Result<bool, Box<dyn Error>>
pub async fn run_symbol<S: Runnable>(
&self,
symbol: S,
force: bool,
) -> Result<bool, Box<dyn Error>>
where
RegularSetupCore<SR, L, B>: SymbolRunner,
{