MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'non-tui-flow-fix' into 'master'

Browse Source 
Fix non TUI with logs flow

See merge request redox-os/redox!1711
This commit is contained in:
Jeremy Soller 2025-11-24 11:53:45 -07:00
commit fb9d5bfbe1
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/repo.rs
View File

@ -292,13 +292,20 @@ fn repo_inner(
let (status_tx, status_rx) = mpsc::channel::<StatusUpdate>(); let (status_tx, status_rx) = mpsc::channel::<StatusUpdate>();
let (mut stdout_writer, mut stderr_writer) = setup_logger(&status_tx, &recipe.name); let (mut stdout_writer, mut stderr_writer) = setup_logger(&status_tx, &recipe.name);
let mut app = TuiApp::new(vec![recipe.clone()]); let mut app = TuiApp::new(vec![recipe.clone()]);
app.dump_logs_anyway = true; app.dump_logs_anyway = config.cook.verbose || !config.cook.nonstop;
let dump_fail_logs = !app.dump_logs_anyway;
let th = thread::spawn(move || { let th = thread::spawn(move || {
while let Ok(update) = status_rx.recv() { while let Ok(update) = status_rx.recv() {
if update == StatusUpdate::CookThreadFinished { match &update {
break; StatusUpdate::CookThreadFinished => break,
StatusUpdate::FailCook(r, _) => {
let (logs, line) = app.get_recipe_log(&r.name);
if let Some(logs) = logs {
println!("{}", join_logs(logs, line));
}
}
_ => app.update_status(update),
} }
app.update_status(update);
} }
}); });
let mut logger = Some((&mut stdout_writer, &mut stderr_writer)); let mut logger = Some((&mut stdout_writer, &mut stderr_writer));
@ -313,11 +320,17 @@ fn repo_inner(
status_tx status_tx
.send(StatusUpdate::FlushLog(recipe.name.clone(), log_path)) .send(StatusUpdate::FlushLog(recipe.name.clone(), log_path))
.unwrap_or_default(); .unwrap_or_default();
if dump_fail_logs && result.is_err() {
status_tx
.send(StatusUpdate::FailCook(recipe.clone(), "".into()))
.unwrap_or_default();
}
} }
status_tx status_tx
.send(StatusUpdate::CookThreadFinished) .send(StatusUpdate::CookThreadFinished)
.unwrap_or_default(); .unwrap_or_default();
let _ = th.join(); let _ = th.join();
result?;
} }
CliCommand::Unfetch => handle_clean(recipe, config, true, true)?, CliCommand::Unfetch => handle_clean(recipe, config, true, true)?,
CliCommand::Clean => handle_clean(recipe, config, false, true)?, CliCommand::Clean => handle_clean(recipe, config, false, true)?,