From 644d69e23bf15d24862c033199338aa8120da6f8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 8 Feb 2025 14:45:21 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 10 ++++++++++ inc/temp.inc.sh | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 8bec28aa..f62e31c2 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.8.21-02062025' +VERS='2.8.22-02082025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 10a6a3cc..af5744ad 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -649,6 +649,7 @@ CHECKPOWER_SERVICE(){ runEvery=10 #SECONDS while true; do start=$(date +%s) + log_start=$(date "+%Y-%m-%d %H:%M:%S") source ${PW_FOLDER}/defaults.inc [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ] && TESTMODE=1 || TESTMODE=0 @@ -843,6 +844,7 @@ Shutting down main servers" 1 end=`date +%s`; runtime=$((end-start)) # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + echo "${log_start}~${runtime}~power" >> ${PW_LOGFOLDER}/service.scantimes [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy" done # & } @@ -852,6 +854,7 @@ OFFSITE_CHECKPOWER_SERVICE(){ runEvery=10 #SECONDS while true; do start=$(date +%s) + log_start=$(date "+%Y-%m-%d %H:%M:%S") source ${PW_FOLDER}/defaults.inc PW_OFFSITEHOSTS=$(echo ${PW_OFFSITE_HOSTS} | tr ',' ' ') @@ -1008,6 +1011,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F" end=`date +%s`; runtime=$((end-start)) # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + echo "${log_start}~${runtime}~offsite-power" >> ${PW_LOGFOLDER}/service.scantimes [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy" done } @@ -1016,6 +1020,9 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F" POWERLOGGER_SERVICE(){ SENDPOWER "POWER LOGGING Service Startup" & while true; do + start=$(date +%s) + log_start=$(date "+%Y-%m-%d %H:%M:%S") + LogDataTime=`date +'%Y-%m-%d %H:%M:%S'` source ${PW_FOLDER}/defaults.inc @@ -1215,6 +1222,9 @@ POWERLOGGER_SERVICE(){ sleep ${PW_MYSQL_LOG_INTERVAL_NORMAL}m fi + end=`date +%s`; runtime=$((end-start)) + # echo -e "runtime: ${runtime}s" + echo "${log_start}~${runtime}~powerlogger" >> ${PW_LOGFOLDER}/service.scantimes done } diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 66d62b2b..0de4f6a9 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -804,7 +804,7 @@ AVERAGETEMP(){ fi } -CHECKTEMP_SERVICE(){ +CHECKTEMP_SERVICE(){ cw=20 runEvery=60 #SECONDS SCAN_THREADS=4 @@ -818,6 +818,7 @@ CHECKTEMP_SERVICE(){ while true; do start=$(date +%s) + log_start=$(date "+%Y-%m-%d %H:%M:%S") source ${PW_FOLDER}/defaults.inc # time="$(date +%H)$(date +%M)" @@ -856,6 +857,7 @@ CHECKTEMP_SERVICE(){ done end=`date +%s`; runtime=$((end-start)) # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + echo "${log_start}~${runtime}~temp" >> ${PW_LOGFOLDER}/service.scantimes [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s done # & }