Robot
/
watchexec
mirror of https://github.com/watchexec/watchexec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix restart (actually issue a stop outcome) (#353) 

Fixes #346
This commit is contained in:
Félix Saparelli 2022-06-28 13:50:56 +00:00
parent 1d2dd7b904
commit 1b70a92162
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/cli/src/config/runtime.rs
View File

@ -66,11 +66,10 @@ pub fn runtime(args: &ArgMatches) -> Result<RuntimeConfig> {
.value_of("signal")
.map(SubSignal::from_str)
.transpose()
.into_diagnostic()?
.unwrap_or(SubSignal::Terminate);
.into_diagnostic()?;
if args.is_present("kill") {
signal = SubSignal::ForceStop;
signal = Some(SubSignal::ForceStop);
}
let print_events = args.is_present("print-events");
@ -187,8 +186,18 @@ pub fn runtime(args: &ArgMatches) -> Result<RuntimeConfig> {
let when_idle = start.clone();
let when_running = match on_busy.as_str() {
"do-nothing" => Outcome::DoNothing,
"restart" => start,
"signal" => Outcome::Signal(signal),
"restart" => Outcome::both(
if let Some(sig) = signal {
Outcome::both(
Outcome::Signal(sig),
Outcome::both(Outcome::Sleep(Duration::from_secs(60)), Outcome::Stop),
)
} else {
Outcome::Stop
},
start,
),
"signal" => Outcome::Signal(signal.unwrap_or(SubSignal::Terminate)),
"queue" => Outcome::wait(start),
_ => Outcome::DoNothing,
};