diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 6b7d415a..b994606e 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -1442,19 +1442,20 @@ POWERLOGGER_SERVICE(){ fi - end=`date +%s`; runtime=$((end-start)) - echo -e "script runtime: ${runtime}s" - echo "${log_start}~${runtime}~powerlogger" >> ${PW_LOGFOLDER}/service.scantimes - if ([ "$(compgen -G "${PW_TMPFOLDER}/temp.*")" != "" ] && [ "$(compgen -G "${PW_TMPFOLDER}/temp.*CPU*")" = "" ]) || [ "$(compgen -G "${PW_TMPFOLDER}/power.*.low")" != "" ]; then - echo "Sleeping for ${PW_MYSQL_LOG_INTERVAL_ABNORMAL}m" - sleep ${PW_MYSQL_LOG_INTERVAL_ABNORMAL}m + runEvery=${PW_MYSQL_LOG_INTERVAL_ABNORMAL} else echo "Sleeping for ${PW_MYSQL_LOG_INTERVAL_NORMAL}m" - sleep ${PW_MYSQL_LOG_INTERVAL_NORMAL}m - fi + runEvery=${PW_MYSQL_LOG_INTERVAL_NORMAL} + fi + runEvery=$(expr ${runEvery} * 60) + end=`date +%s`; runtime=$((end-start)) + echo -e "script runtime: ${runtime}s"; echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + echo "${log_start}~${runtime}~powerlogger" >> ${PW_LOGFOLDER}/service.scantimes + + [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s done }