From 6527ee6f14031d8325f83f49422b0b51b0e1ec4c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 9 Feb 2024 11:16:52 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- nodemgmt-scripts.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index bf1fbf84..1b8a2bb1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.85-02092024' +VERS='5.1.86-02092024' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index fa7e9348..51517810 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1265,9 +1265,12 @@ GUI(){ else [ "${MM_ACTION}" != "report" ] && echo -e "${idsCL[LightRed]}Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!${idsCL[Default]}\n" - if [ ! -f ${NM_TMPFOLDER}/.overload ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.overload)) -ge 600 ]; then + if [ ! -f ${NM_TMPFOLDER}/.overload ]; then SENDNOTICE "NODEMGMT OVERLOAD" "Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!" 1 touch ${NM_TMPFOLDER}/.overload + elif [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.overload)) -ge 900 ]; then + SENDNOTICE "NODEMGMT OVERLOAD" "OMG SAVE ME, IM BEING OVERRUN BY STATUS CHECKS!" 1 + touch ${NM_TMPFOLDER}/.overload fi exit 1 fi