From 3133ee2401a1e45994004027d7f4930dfa059e16 Mon Sep 17 00:00:00 2001 From: Sagar Dhawan Date: Mon, 4 Nov 2019 18:12:07 -0800 Subject: [PATCH] Fix limited iftop output and failure to stop iftop (#6723) * Fix limited iftop output and failure to stop iftop * Shellcheck * Ignore shellcheck --- net/net.sh | 7 ++++++- scripts/iftop.sh | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net/net.sh b/net/net.sh index dd554a2e1a..67aa1de9f4 100755 --- a/net/net.sh +++ b/net/net.sh @@ -812,10 +812,15 @@ stopNode() { PS4=\"$PS4\" set -x ! tmux list-sessions || tmux kill-session + declare sudo= + if sudo true; then + sudo="sudo -n" + fi + for pid in solana/*.pid; do pgid=\$(ps opgid= \$(cat \$pid) | tr -d '[:space:]') if [[ -n \$pgid ]]; then - sudo kill -- -\$pgid + \$sudo kill -- -\$pgid fi done for pattern in node solana- remote-; do diff --git a/scripts/iftop.sh b/scripts/iftop.sh index 722d6fb69b..17675b27f9 100755 --- a/scripts/iftop.sh +++ b/scripts/iftop.sh @@ -12,5 +12,5 @@ sudo= if sudo true; then sudo="sudo -n" fi - -$sudo iftop -i "$(ifconfig | grep mtu | grep -iv loopback | grep -i running | awk 'BEGIN { FS = ":" } ; {print $1}')" -nNbBP -t +# shellcheck disable=SC2086 +exec $sudo iftop -i "$(ifconfig | grep mtu | grep -iv loopback | grep -i running | awk 'BEGIN { FS = ":" } ; {print $1}')" -nNbBP -t -L 1000