From 01ebbe367a89886843b2ac79231ff150f149df1c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2019 22:01:05 -0700
Subject: [PATCH] Ensure validator process is kill when stdout/stderr are
 redirected (#5179) (#5190)

automerge
---
 multinode-demo/fullnode.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh
index b663e28f71..d9a4f52c19 100755
--- a/multinode-demo/fullnode.sh
+++ b/multinode-demo/fullnode.sh
@@ -371,13 +371,14 @@ PS4="$(basename "$0"): "
 
 pid=
 kill_fullnode() {
+  # Note: do not echo anything from this function to ensure $pid is actually
+  # killed when stdout/stderr are redirected
+  set +ex
   if [[ -n $pid ]]; then
     declare _pid=$pid
     pid=
-    echo "killing pid $_pid"
     kill "$_pid" || true
     wait "$_pid" || true
-    echo "$_pid killed"
   fi
 }
 trap 'kill_fullnode' INT TERM ERR