voltron/dsmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dsmon.sh

Browse Source
This commit is contained in:
David Schroeder
2024-01-26 09:54:23 -06:00
parent c36b20fbc6
commit d47ad7f29f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dsmon.sh
View File

@@ -366,13 +366,14 @@ RUNCMD(){
nc_count=0; completed=false nc_count=0; completed=false
until [ "${completed}" == "true" ]; do until [ "${completed}" == "true" ]; do
for nodecmd in /tmp/.dsmon.runcmd.*.done; do for nodecmd in /tmp/.dsmon.runcmd.*.done; do
HOST=$(grep -oP '(?<=runcmd.).*?(?=.done)' <<< "${nodecmd}") # HOST=$(grep -oP '(?<=runcmd.).*?(?=.done)' <<< "${nodecmd}")
if [ "${HOST}" != "*" ]; then # if [ "${HOST}" != "*" ]; then
if [[ "${nodecmd}" != *"*"* ]]; then
nodecmd_output=$(cat ${nodecmd}) nodecmd_output=$(cat ${nodecmd})
[ "${nodecmd_output}" != "" ] && echo -e "${nodecmd_output}\n" [ "${nodecmd_output}" != "" ] && echo -e "${nodecmd_output}\n"
rm -f ${nodecmd}
((nc_count++))
fi fi
rm -f ${nodecmd}
((nc_count++))
done done
if [ ${nc_count} -eq ${ncount} ]; then if [ ${nc_count} -eq ${ncount} ]; then
completed=true completed=true
@@ -393,7 +394,9 @@ RUNCMD_SUB(){
tmpfile=/tmp/.dsmon.runcmd.${host// /-} tmpfile=/tmp/.dsmon.runcmd.${host// /-}
touch ${tmpfile}.running touch ${tmpfile}.running
echo -e "${idsST[Bold]}${idsCL[LightCyan]} ${host} - Running command: ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22}${idsCL[Default]}${idsST[Reset]}" >> ${tmpfile}.running echo -e "${idsST[Bold]}${idsCL[LightCyan]} ${host} - Running command: ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22}${idsCL[Default]}${idsST[Reset]}" >> ${tmpfile}.running
if ! ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ip} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22} >> ${tmpfile}.running ; then if ssh_output=$(ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ip} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22}) ; then
echo -e "${ssh_output}" >> ${tmpfile}.running
else
echo -e "${idsST[Bold]}${idsCL[Red]} ${host} - Timeout${idsCL[Default]}${idsST[Reset]}" >> ${tmpfile}.running echo -e "${idsST[Bold]}${idsCL[Red]} ${host} - Timeout${idsCL[Default]}${idsST[Reset]}" >> ${tmpfile}.running
fi fi
mv ${tmpfile}.running ${tmpfile}.done mv ${tmpfile}.running ${tmpfile}.done