Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New option: --signal-map #710

Merged
merged 9 commits into from
Dec 9, 2023
Merged

New option: --signal-map #710

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift click to select a range
e90c839
supervisor: add trace logging
passcod Dec 9, 2023
f256532
Add more trace logging to cli
passcod Dec 9, 2023
c32b4dc
signals: derive Hash
passcod Dec 9, 2023
34e44df
Don't restart when we only got a signal
passcod Dec 9, 2023
f9f4b40
New: --map-signal
passcod Dec 9, 2023
30d3221
Remove manual pdf
passcod Dec 9, 2023
129072d
Update completions and manpage
passcod Dec 9, 2023
e03cf9f
Merge branch 'main' into signal-map
passcod Dec 9, 2023
f8a5f15
Undo fix applied later
passcod Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add more trace logging to cli
  • Loading branch information
@passcod
passcod committed Dec 9, 2023
commit f256532ea44e56e15b89d4ab05be5f9a7c8c88be
33 changes: 28 additions & 5 deletions crates/cli/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 15,7 @@ use miette::{miette, IntoDiagnostic, Report, Result};
use notify_rust::Notification;
use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
use tokio::{process::Command as TokioCommand, time::sleep};
use tracing::{debug, debug_span, error};
use tracing::{debug, debug_span, error, instrument, trace, trace_span, Instrument};
use watchexec::{
command::{Command, Program, Shell, SpawnOptions},
error::RuntimeError,
Expand All @@ -32,7 32,7 @@ use crate::{
};
use crate::{emits::events_to_simple_format, state::State};

#[derive(Clone, Copy)]
#[derive(Clone, Copy, Debug)]
struct OutputFlags {
quiet: bool,
colour: ColorChoice,
Expand Down Expand Up @@ -189,12 189,16 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {
let command = command.clone();
let emit_file = emit_file.clone();
let workdir = workdir.clone();
Box::new(async move {
Box::new(
async move {
trace!(events=?action.events, "handling action");

let add_envs = add_envs.clone();
let command = command.clone();
let emit_file = emit_file.clone();
let workdir = workdir.clone();

trace!("set spawn hook for workdir and environment variables");
let job = action.get_or_create_job(id, move || command.clone());
let events = action.events.clone();
job.set_spawn_hook(move |command, _| {
Expand All @@ -212,13 216,15 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {

let show_events = || {
if print_events {
trace!("print events to stderr");
for (n, event) in action.events.iter().enumerate() {
eprintln!("[EVENT {n}] {event}");
}
}
};

if once {
debug!("debug mode: run once and quit");
show_events();

if let Some(delay) = delay_run {
Expand Down Expand Up @@ -247,6 253,7 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {
}

let signals: Vec<Signal> = action.signals().collect();
trace!(?signals, "received some signals");

// if we got a terminate or interrupt signal, quit
if signals.contains(&Signal::Terminate) || signals.contains(&Signal::Interrupt) {
Expand All @@ -265,6 272,7 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {
match mode {
ClearMode::Clear => {
clearscreen::clear().ok();
debug!("cleared screen");
}
ClearMode::Reset => {
for cs in [
Expand All @@ -276,20 284,23 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {
] {
cs.clear().ok();
}
debug!("hard-reset screen");
}
}
}

show_events();

if let Some(delay) = delay_run {
trace!("delaying run by sleeping inside the job");
job.run_async(move |_| {
Box::new(async move {
sleep(delay).await;
})
});
}

trace!("querying job state via run_async");
job.run_async({
let job = job.clone();
move |context| {
Expand All @@ -298,6 309,7 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {
Box::new(async move {
let innerjob = job.clone();
if is_running {
trace!(?on_busy, "job is running, decide what to do");
match on_busy {
OnBusyUpdate::DoNothing => {}
OnBusyUpdate::Signal => {
Expand Down Expand Up @@ -346,22 358,30 @@ pub fn make_config(args: &Args, state: &State) -> Result<Config> {
}
}
} else {
trace!("job is not running, start it");
job.start();
job.run(move |context| {
setup_process(innerjob.clone(), context.command.clone(), outflags)
setup_process(
innerjob.clone(),
context.command.clone(),
outflags,
)
});
}
})
}
});

action
})
}
.instrument(trace_span!("action handler")),
)
});

Ok(config)
}

#[instrument(level = "debug")]
fn interpret_command_args(args: &Args) -> Result<Arc<Command>> {
let mut cmd = args.command.clone();
if cmd.is_empty() {
Expand Down Expand Up @@ -422,6 442,7 @@ fn interpret_command_args(args: &Args) -> Result<Arc<Command>> {
}))
}

#[instrument(level = "trace")]
fn setup_process(job: Job, command: Arc<Command>, outflags: OutputFlags) {
if outflags.toast {
Notification::new()
Expand Down Expand Up @@ -452,6 473,7 @@ fn setup_process(job: Job, command: Arc<Command>, outflags: OutputFlags) {
});
}

#[instrument(level = "trace")]
fn end_of_process(state: &CommandState, outflags: OutputFlags) {
let CommandState::Finished {
status,
Expand Down Expand Up @@ -509,6 531,7 @@ fn end_of_process(state: &CommandState, outflags: OutputFlags) {
}
}

#[instrument(level = "trace")]
fn emit_events_to_command(
command: &mut TokioCommand,
events: Arc<[Event]>,
Expand Down