#123 --watch-idle flag implementation
This commit is contained in:
parent
90b9a85c0c
commit
de5ed1c2bd
|
@ -74,6 +74,8 @@ pub struct Args {
|
||||||
/// Interval for polling. (seconds)
|
/// Interval for polling. (seconds)
|
||||||
#[builder(default = "2")]
|
#[builder(default = "2")]
|
||||||
pub poll_interval: u32,
|
pub poll_interval: u32,
|
||||||
|
#[builder(default)]
|
||||||
|
pub watch_idle: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ArgsBuilder {
|
impl ArgsBuilder {
|
||||||
|
@ -205,7 +207,11 @@ where
|
||||||
.help("Do not wrap command in 'sh -c' resp. 'cmd.exe /C'")
|
.help("Do not wrap command in 'sh -c' resp. 'cmd.exe /C'")
|
||||||
.short("n")
|
.short("n")
|
||||||
.long("no-shell"))
|
.long("no-shell"))
|
||||||
.arg(Arg::with_name("once").short("1").hidden(true));
|
.arg(Arg::with_name("once").short("1").hidden(true))
|
||||||
|
.arg(Arg::with_name("watch-idle")
|
||||||
|
.help("Ignores commands while the process is still running")
|
||||||
|
.short("W")
|
||||||
|
.long("watch-idle"));
|
||||||
|
|
||||||
let args = match from {
|
let args = match from {
|
||||||
None => app.get_matches(),
|
None => app.get_matches(),
|
||||||
|
@ -300,5 +306,6 @@ where
|
||||||
once: args.is_present("once"),
|
once: args.is_present("once"),
|
||||||
poll: args.occurrences_of("poll") > 0,
|
poll: args.occurrences_of("poll") > 0,
|
||||||
poll_interval,
|
poll_interval,
|
||||||
|
watch_idle: args.is_present("watch-idle"),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
46
src/run.rs
46
src/run.rs
|
@ -189,6 +189,19 @@ impl ExecHandler {
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn has_running_process(&self) -> bool {
|
||||||
|
let guard = self
|
||||||
|
.child_process
|
||||||
|
.read()
|
||||||
|
.expect("poisoned lock in signal_process");
|
||||||
|
|
||||||
|
if let Some(ref _child) = *guard {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Handler for ExecHandler {
|
impl Handler for ExecHandler {
|
||||||
|
@ -217,20 +230,35 @@ impl Handler for ExecHandler {
|
||||||
//
|
//
|
||||||
let scenario = (self.args.restart, self.signal.is_some());
|
let scenario = (self.args.restart, self.signal.is_some());
|
||||||
|
|
||||||
|
let running_process = self.has_running_process();
|
||||||
|
|
||||||
match scenario {
|
match scenario {
|
||||||
// Custom restart behaviour (--restart was given, and --signal specified):
|
// Custom restart behaviour (--restart was given, and --signal specified):
|
||||||
// Send specified signal to the child, wait for it to exit, then run the command again
|
// Send specified signal to the child, wait for it to exit, then run the command again
|
||||||
(true, true) => {
|
(true, true) => {
|
||||||
signal_process(&self.child_process, self.signal, true);
|
if self.args.watch_idle {
|
||||||
self.spawn(ops)?;
|
if !running_process {
|
||||||
|
self.spawn(ops)?;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
signal_process(&self.child_process, self.signal, true);
|
||||||
|
self.spawn(ops)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default restart behaviour (--restart was given, but --signal wasn't specified):
|
// Default restart behaviour (--restart was given, but --signal wasn't specified):
|
||||||
// Send SIGTERM to the child, wait for it to exit, then run the command again
|
// Send SIGTERM to the child, wait for it to exit, then run the command again
|
||||||
(true, false) => {
|
(true, false) => {
|
||||||
let sigterm = signal::new(Some("SIGTERM".into()));
|
let sigterm = signal::new(Some("SIGTERM".into()));
|
||||||
signal_process(&self.child_process, sigterm, true);
|
|
||||||
self.spawn(ops)?;
|
if self.args.watch_idle {
|
||||||
|
if !running_process {
|
||||||
|
self.spawn(ops)?;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
signal_process(&self.child_process, sigterm, true);
|
||||||
|
self.spawn(ops)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SIGHUP scenario: --signal was given, but --restart was not
|
// SIGHUP scenario: --signal was given, but --restart was not
|
||||||
|
@ -240,8 +268,14 @@ impl Handler for ExecHandler {
|
||||||
// Default behaviour (neither --signal nor --restart specified):
|
// Default behaviour (neither --signal nor --restart specified):
|
||||||
// Make sure the previous run was ended, then run the command again
|
// Make sure the previous run was ended, then run the command again
|
||||||
(false, false) => {
|
(false, false) => {
|
||||||
signal_process(&self.child_process, None, true);
|
if self.args.watch_idle {
|
||||||
self.spawn(ops)?;
|
if !running_process {
|
||||||
|
self.spawn(ops)?;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
signal_process(&self.child_process, None, true);
|
||||||
|
self.spawn(ops)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue