From 913005476beb880843203c363e8b7b6fb96725c2 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Tue, 4 Dec 2012 12:13:40 +0100 Subject: [PATCH] * alter log rotation configuration * inverter.php now only schedules itself once * todo: use next day sunrise for scheduling? implement margins? --- etc/logrotate.d/inverter | 2 +- opt/inverter/inverter.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/etc/logrotate.d/inverter b/etc/logrotate.d/inverter index ab8e648..fa282c9 100644 --- a/etc/logrotate.d/inverter +++ b/etc/logrotate.d/inverter @@ -1,5 +1,5 @@ /var/log/inverter.log { - rotate 15 + rotate 5 compress missingok notifempty diff --git a/opt/inverter/inverter.php b/opt/inverter/inverter.php index 2a27d6c..84b9900 100644 --- a/opt/inverter/inverter.php +++ b/opt/inverter/inverter.php @@ -69,6 +69,7 @@ while (!$bStop && !System_Daemon::isDying()) { /* Schedule next sleep time */ if (!$bAlarm) { $sTime = date('H:i', strtotime($sSleep)); + System_Daemon::info(sprintf('Schedule sleep at %s', $sTime)); command(sprintf('at -f %s %s 2> /dev/null', FILE_DAEMON_STOP, $sTime)); $bAlarm = true; } @@ -77,17 +78,17 @@ while (!$bStop && !System_Daemon::isDying()) { System_Daemon::info('Running task'); command(TASK); System_Daemon::info('Task ended'); - } else { - /* Schedule next wake time */ - schedule_wake(); + } else { $bStop = true; } } +/* Schedule next wake time */ +schedule_wake(); + /* Stop daemon */ System_Daemon::stop(); -schedule_wake(); function schedule_wake() { global $sWake; $sTime = date('H:i', strtotime($sWake)); // ignore slight deviation for next day