Merge remote-tracking branch 'github/pull/514'

[chef.git] / cookbooks / web / templates / default / passenger.cron.erb

diff --git a/cookbooks/web/templates/default/passenger.cron.erb b/cookbooks/web/templates/default/passenger.cron.erb
index b4d78fd965f3192627bc500ff11e8b1fcdd7438a..d3cef76ee4c1c7591b50d7aa9eddd01b6ee05ae8 100644 (file)
--- a/cookbooks/web/templates/default/passenger.cron.erb
+++ b/cookbooks/web/templates/default/passenger.cron.erb
@@ -4,13 +4,13 @@
 pgrep -u rails -f Rack | sort > /tmp/rails.actual.$$
 
 # Get a list of rack processes we expect to be running
-passenger-status | awk '/PID:/ { print $3 }' | sort > /tmp/rails.expected.$$
+PASSENGER_INSTANCE_REGISTRY_DIR=<%= node[:passenger][:instance_registry_dir] %> passenger-status | awk '/PID:/ { print $3 }' | sort > /tmp/rails.expected.$$
 
 # Get a list of unexpected rack processes
 pids=$(comm -23 /tmp/rails.actual.$$ /tmp/rails.expected.$$)
 
 # Kill any expected rack processes
-[ -n "$pids" ] && kill -9 $pids
+[ -n "$pids" ] && kill -9 $pids > /dev/null 2>&1
 
 # Remove our temporary files
 rm -f /tmp/rails.actual.$$ /tmp/rails.expected.$$