瀏覽代碼

Fix limited iftop output and failure to stop iftop (#6723)

* Fix limited iftop output and failure to stop iftop

* Shellcheck

* Ignore shellcheck
Sagar Dhawan 6 年之前
父節點
當前提交
3133ee2401
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 6 1
      net/net.sh
  2. 2 2
      scripts/iftop.sh

+ 6 - 1
net/net.sh

@@ -812,10 +812,15 @@ stopNode() {
       PS4=\"$PS4\"
       PS4=\"$PS4\"
       set -x
       set -x
       ! tmux list-sessions || tmux kill-session
       ! tmux list-sessions || tmux kill-session
+      declare sudo=
+      if sudo true; then
+        sudo="sudo -n"
+      fi
+
       for pid in solana/*.pid; do
       for pid in solana/*.pid; do
         pgid=\$(ps opgid= \$(cat \$pid) | tr -d '[:space:]')
         pgid=\$(ps opgid= \$(cat \$pid) | tr -d '[:space:]')
         if [[ -n \$pgid ]]; then
         if [[ -n \$pgid ]]; then
-          sudo kill -- -\$pgid
+          \$sudo kill -- -\$pgid
         fi
         fi
       done
       done
       for pattern in node solana- remote-; do
       for pattern in node solana- remote-; do

+ 2 - 2
scripts/iftop.sh

@@ -12,5 +12,5 @@ sudo=
 if sudo true; then
 if sudo true; then
 sudo="sudo -n"
 sudo="sudo -n"
 fi
 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