suppress error messages from subshell trap kills

frc · Feb 4, 2015 · b83fc47 · b83fc47
1 parent 165b085
commit b83fc47
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2
@@ -312,7 +312,7 @@ trap 'trap - INT; kill -INT $$; exit' INT
 [[ $verbose ]] && echo "Starting log redirection..." >&2
 (
     trap 'echo "tail" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     touch "${logs[@]}"
     tail -qF -n 0 "${logs[@]}" 1>&2 &
     wait
@@ -321,7 +321,7 @@ trap 'trap - INT; kill -INT $$; exit' INT
 echo "Starting hhvm..." >&2
 (
     trap 'echo "hhvm" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     hhvm --mode server "${php_configs[@]}" &
     wait
 ) & pids+=($!)
@@ -332,7 +332,7 @@ sleep 2
 echo "Starting httpd..." >&2
 (
     trap 'echo "httpd" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     httpd -D NO_DETACH -c "Include $httpd_config" &
     wait
 ) & pids+=($!)

diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx
@@ -276,7 +276,7 @@ trap 'trap - INT; kill -INT $$; exit' INT
 [[ $verbose ]] && echo "Starting log redirection..." >&2
 (
     trap 'echo "tail" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     touch "${logs[@]}"
     tail -qF -n 0 "${logs[@]}" 1>&2 &
     wait
@@ -285,7 +285,7 @@ trap 'trap - INT; kill -INT $$; exit' INT
 echo "Starting hhvm..." >&2
 (
     trap 'echo "hhvm" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     hhvm --mode server "${php_config[@]}" &
     wait
 ) & pids+=($!)
@@ -296,7 +296,7 @@ sleep 2
 echo "Starting nginx..." >&2
 (
     trap 'echo "nginx" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     nginx -g "daemon off; include $nginx_config;" &
     wait
 ) & pids+=($!)

diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2
@@ -352,7 +352,7 @@ trap 'trap - INT; kill -INT $$; exit' INT
 echo "Starting php-fpm..." >&2
 (
     trap 'echo "php-fpm" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     php-fpm --nodaemonize -y "$fpm_config" -c "$php_config" &
     wait
 ) & pids+=($!)
@@ -363,7 +363,7 @@ sleep 2
 echo "Starting httpd..." >&2
 (
     trap 'echo "httpd" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     httpd -D NO_DETACH -c "Include $httpd_config" &
     wait
 ) & pids+=($!)

diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx
@@ -352,7 +352,7 @@ trap 'trap - INT; kill -INT $$; exit' INT
 echo "Starting php-fpm..." >&2
 (
     trap 'echo "php-fpm" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     php-fpm --nodaemonize -y "$fpm_config" -c "$php_config" &
     wait
 ) & pids+=($!)
@@ -363,7 +363,7 @@ sleep 2
 echo "Starting nginx..." >&2
 (
     trap 'echo "nginx" >&3;' EXIT
-    trap 'kill -TERM $!' TERM
+    trap 'kill -TERM $! 2> /dev/null' TERM
     nginx -g "daemon off; include $nginx_config;" &
     wait
 ) & pids+=($!)