Skip to content

Add killCommand && rerunTimeout option in CLI #130

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add killCommand && rerunTimeout option in CLI #130

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89786cc
support killCommand
soyking May 23, 2017
633dcaf
add rerunTimeout:
soyking May 23, 2017
a64fc7d
remove redundant log
soyking Jun 2, 2017
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
45 changes: 43 additions & 2 deletions cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ if(argv._.length === 0) {
'[--interval=<seconds>]',
'[--ignoreDotFiles]',
'[--ignoreUnreadable]',
'[--ignoreDirectoryPattern]'
'[--ignoreDirectoryPattern]',
'[--killCommand]',
'[--killSignal]',
'[--rerunTimeout]'
].join(' '))
process.exit()
}
Expand Down Expand Up @@ -48,6 +51,18 @@ if(argv.ignoreDirectoryPattern || argv.p) {
watchTreeOpts.ignoreDirectoryPattern = new RegExp(match[1], match[2])
}

var killCommand = false
if(argv.killCommand || argv.k) {
killCommand = true
}

var killSignal = "SIGHUP"
if(argv.killSignal || argv.s) {
killSignal = argv.killSignal || argv.s
}

var rerunTimeout = Number(argv.rerunTimeout || argv.r)

if(argv.filter || argv.f) {
try {
watchTreeOpts.filter = require(path.resolve(process.cwd(), argv.filter || argv.f))
Expand All @@ -61,6 +76,17 @@ var wait = false

var dirLen = dirs.length
var skip = dirLen - 1
var child = null
var childHasExit = false

function run_child(command) {
child = execshell(command)
child.on("exit", () => {
childHasExit = true
})
return child
}

for(i = 0; i < dirLen; i++) {
var dir = dirs[i]
console.error('> Watching', dir)
Expand All @@ -71,7 +97,22 @@ for(i = 0; i < dirLen; i++) {
}
if(wait) return

execshell(command)
if (killCommand) {
if (child && !childHasExit) {
// stop previous child and fun
child.removeAllListeners()
child.on("exit", () => {
setTimeout(() => child = run_child(command), rerunTimeout * 1000)
})
child.kill(killSignal)
} else {
// run at first time or previous child has exited
child = run_child(command)
childHasExit = false
}
} else {
execshell(command)
}

if(waitTime > 0) {
wait = true
Expand Down