From db3c95ea10006374a51b4764663029b816460f99 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 11 Jul 2019 08:39:26 +0200 Subject: [PATCH] set last run of letsencrypt cron when called in webserver-cron Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/HttpConfigBase.php | 2 ++ lib/Froxlor/Cron/MasterCron.php | 12 +----------- lib/Froxlor/System/Cronjob.php | 10 ++++++++++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/Froxlor/Cron/Http/HttpConfigBase.php b/lib/Froxlor/Cron/Http/HttpConfigBase.php index e5b68629..b1c68993 100644 --- a/lib/Froxlor/Cron/Http/HttpConfigBase.php +++ b/lib/Froxlor/Cron/Http/HttpConfigBase.php @@ -35,6 +35,8 @@ class HttpConfigBase \Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, 'Running Let\'s Encrypt cronjob prior to regenerating webserver config files'); \Froxlor\Cron\Http\LetsEncrypt\AcmeSh::$no_inserttask = true; \Froxlor\Cron\Http\LetsEncrypt\AcmeSh::run(); + // set last run timestamp of cronjob + \Froxlor\System\Cronjob::updateLastRunOfCron('letsencrypt'); } } diff --git a/lib/Froxlor/Cron/MasterCron.php b/lib/Froxlor/Cron/MasterCron.php index 18839df2..b640aa45 100644 --- a/lib/Froxlor/Cron/MasterCron.php +++ b/lib/Froxlor/Cron/MasterCron.php @@ -96,7 +96,7 @@ class MasterCron extends \Froxlor\Cron\FroxlorCron if (count($jobs_to_run) > 0) { // include all jobs we want to execute foreach ($jobs_to_run as $cron) { - self::updateLastRunOfCron($cron); + \Froxlor\System\Cronjob::updateLastRunOfCron($cron); $cronfile = self::getCronModule($cron); if ($cronfile && class_exists($cronfile)) { $cronfile::run(); @@ -336,16 +336,6 @@ class MasterCron extends \Froxlor\Cron\FroxlorCron } } - private static function updateLastRunOfCron($cronname) - { - $upd_stmt = Database::prepare(" - UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `lastrun` = UNIX_TIMESTAMP() WHERE `cronfile` = :cron; - "); - Database::pexecute($upd_stmt, array( - 'cron' => $cronname - )); - } - private static function getCronModule($cronname) { $upd_stmt = Database::prepare(" diff --git a/lib/Froxlor/System/Cronjob.php b/lib/Froxlor/System/Cronjob.php index 660dd075..a08dbaa0 100644 --- a/lib/Froxlor/System/Cronjob.php +++ b/lib/Froxlor/System/Cronjob.php @@ -361,4 +361,14 @@ class Cronjob die($message); } + + public static function updateLastRunOfCron($cronname) + { + $upd_stmt = Database::prepare(" + UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `lastrun` = UNIX_TIMESTAMP() WHERE `cronfile` = :cron; + "); + Database::pexecute($upd_stmt, array( + 'cron' => $cronname + )); + } }