diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 290a9d26..af1cde14 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -745,7 +745,7 @@ CHECKPOWER(){ fi if [ ${REPORT} -eq 0 ]; then if [ "${avgdays}" != "" ]; then - modend=`date +%s`; modruntime=$((modend-modstart)); echo -e "${idsCL[Default]}runtime: ${modruntime}s" + modend=`date +%s`; modruntime=$((modend-modstart)); echo -e "\n${idsCL[Default]}script runtime: ${modruntime}s" fi [ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}" fi @@ -960,7 +960,7 @@ Shutting down main servers" 1 fi end=`date +%s`; runtime=$((end-start)) - # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + # echo -e "script 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 # & @@ -1127,7 +1127,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F" fi end=`date +%s`; runtime=$((end-start)) - # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + # echo -e "script 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 @@ -1430,7 +1430,7 @@ POWERLOGGER_SERVICE(){ fi end=`date +%s`; runtime=$((end-start)) - # echo -e "runtime: ${runtime}s" + # echo -e "script 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 9d1d929c..aa1100cb 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -670,7 +670,7 @@ CHECKTEMP(){ done fi rm -f ${PW_TMPFOLDER}/.local.fanspeed.* - [ "${avgdays}" != "" ] && [ ${REPORT} -eq 0 ] && end=`date +%s`; runtime=$((end-start)); echo -e "${idsCL[Default]}runtime: ${runtime}s" + [ "${avgdays}" != "" ] && [ ${REPORT} -eq 0 ] && end=`date +%s`; runtime=$((end-start)); echo -e "${idsCL[Default]}script runtime: ${runtime}s" [ ${REPORT} -eq 0 ] && [ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}" } @@ -881,7 +881,7 @@ CHECKTEMP_SERVICE(){ fi done end=`date +%s`; runtime=$((end-start)) - # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + # echo -e "script 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 # & @@ -1841,7 +1841,7 @@ SERVERROOM_TEMP_DIFFERENCE(){ fi fi end=`date +%s`; runtime=$((end-start)) - echo -e "\nruntime: ${runtime}s\n" + echo -e "\nscript runtime: ${runtime}s\n" } GET_DEFAULT_FANSPEED(){