This commit is contained in:
2024-01-09 16:13:42 -06:00
parent d76d229ea8
commit 216e781102
4 changed files with 8 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
VERS='2.5.120-01092024' VERS='2.5.121-01092024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '

View File

@@ -328,7 +328,7 @@ CHECKPOWER(){
[ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts" [ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
fi fi
if [ ${REPORT} -eq 0 ]; then if [ ${REPORT} -eq 0 ]; then
end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}" end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}s"
fi fi
[ "${PW_ACTION}" != "" ] && [ ${REPORT} -eq 0 ] && echo -e "${idsCL[Default]}" [ "${PW_ACTION}" != "" ] && [ ${REPORT} -eq 0 ] && echo -e "${idsCL[Default]}"
} }
@@ -565,7 +565,7 @@ Shutting down main servers" 1
# #
# fi # fi
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
# echo -e "Runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s"
[ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy" [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy"
done # & done # &
} }

View File

@@ -136,7 +136,7 @@ CHECKTEMP(){
fi fi
done done
rm -f ${PW_TMPFOLDER}/.fanspeed.* rm -f ${PW_TMPFOLDER}/.fanspeed.*
end=`date +%s`; runtime=$((end-start)); echo -e "runtime: ${runtime}" end=`date +%s`; runtime=$((end-start)); echo -e "runtime: ${runtime}s"
[ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}" [ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}"
} }
@@ -349,7 +349,7 @@ CHECKTEMP_SERVICE(){
fi fi
done done
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
echo -e "Runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s"
[ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s
done # & done # &
} }
@@ -950,7 +950,7 @@ SERVERROOM_TEMP_DIFFERENCE(){
fi fi
fi fi
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
echo -e "\nRuntime: ${runtime}\n" echo -e "\nruntime: ${runtime}s\n"
} }

View File

@@ -718,7 +718,7 @@ TEST(){
end=`date +%s` end=`date +%s`
runtime=$((end-start)) runtime=$((end-start))
echo "runtime: ${runtime}" echo "runtime: ${runtime}s"
echo echo
} }
@@ -746,7 +746,7 @@ fi
DAILYTEMP DAILYTEMP
# SENDNOTICE "Daily Temp Readings" "$(DAILYTEMP)" # SENDNOTICE "Daily Temp Readings" "$(DAILYTEMP)"
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
echo -e "\nruntime: ${runtime}\n" echo -e "\nruntime: ${runtime}s\n"
;; ;;
checktemp) CHECKTEMP ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; checktemp) CHECKTEMP ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};;
checkpower) CHECKPOWER ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; checkpower) CHECKPOWER ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};;