Mic92/blog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix an issue in 'watch' and 'preview' where main process is terminated with child processes still running

Browse Source
This commit is contained in:
fhemberger 2011-09-12 21:36:14 +02:00
parent 04973e0948
commit 565648300b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Rakefile
View File

@ -60,12 +60,11 @@ task :watch do
compassPid = Process.spawn("compass watch") compassPid = Process.spawn("compass watch")
trap("INT") { trap("INT") {
Process.kill(9, jekyllPid) [jekyllPid, compassPid].each { |pid| Process.kill(9, pid) rescue Errno::ESRCH }
Process.kill(9, compassPid) exit 0
exit 0
} }
Process.wait [jekyllPid, compassPid].each { |pid| Process.wait(pid) }
end end
desc "preview the site in a web browser" desc "preview the site in a web browser"
@ -77,13 +76,11 @@ task :preview do
rackupPid = Process.spawn("rackup --port #{server_port}") rackupPid = Process.spawn("rackup --port #{server_port}")
trap("INT") { trap("INT") {
Process.kill(9, jekyllPid) [jekyllPid, compassPid, rackupPid].each { |pid| Process.kill(9, pid) rescue Errno::ESRCH }
Process.kill(9, compassPid) exit 0
Process.kill(9, rackupPid)
exit 0
} }
Process.wait [jekyllPid, compassPid, rackupPid].each { |pid| Process.wait(pid) }
end end
# usage rake new_post[my-new-post] or rake new_post['my new post'] or rake new_post (defaults to "new-post") # usage rake new_post[my-new-post] or rake new_post['my new post'] or rake new_post (defaults to "new-post")