Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix cache issue in recurring cron job report.
James Coleed54a5c9a4d0
diff --git a/app/Support/Cronjobs/RecurringCronjob.php b/app/Support/Cronjobs/RecurringCronjob.phpindex 995f31e777..cc6bb7f901 100644--- a/app/Support/Cronjobs/RecurringCronjob.php+++ b/app/Support/Cronjobs/RecurringCronjob.php@@ -28,6 +28,8 @@ use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Jobs\CreateRecurringTransactions;use FireflyIII\Models\Configuration;+use FireflyIII\Support\Facades\FireflyConfig;+use Illuminate\Support\Facades\Log;/*** Class RecurringCronjob@@ -39,34 +41,34 @@ class RecurringCronjob extends AbstractCronjob*/public function fire(): void{- app('log')->debug(sprintf('Now in %s', __METHOD__));+ Log::debug(sprintf('Now in %s', __METHOD__));/** @var Configuration $config */- $config = app('fireflyconfig')->get('last_rt_job', 0);+ $config = FireflyConfig::get('last_rt_job', 0);$lastTime = (int) $config->data;$diff = Carbon::now()->getTimestamp() - $lastTime;$diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);if (0 === $lastTime) {- app('log')->info('Recurring transactions cron-job has never fired before.');+ Log::info('Recurring transactions cron-job has never fired before.');}// less than half a day ago:if ($lastTime > 0 && $diff <= 43200) {- app('log')->info(sprintf('It has been %s since the recurring transactions cron-job has fired.', $diffForHumans));+ Log::info(sprintf('It has been "%s" since the recurring transactions cron-job has fired.', $diffForHumans));if (false === $this->force) {- app('log')->info('The cron-job will not fire now.');- $this->message = sprintf('It has been %s since the recurring transactions cron-job has fired. It will not fire now.', $diffForHumans);+ Log::info('The cron-job will not fire now.');+ $this->message = sprintf('It has been "%s" since the recurring transactions cron-job has fired. It will not fire now.', $diffForHumans);$this->jobFired = false;$this->jobErrored = false;$this->jobSucceeded = false;return;}- app('log')->info('Execution of the recurring transaction cron-job has been FORCED.');+ Log::info('Execution of the recurring transaction cron-job has been FORCED.');}if ($lastTime > 0 && $diff > 43200) {- app('log')->info(sprintf('It has been %s since the recurring transactions cron-job has fired. It will fire now!', $diffForHumans));+ Log::info(sprintf('It has been "%s" since the recurring transactions cron-job has fired. It will fire now!', $diffForHumans));}$this->fireRecurring();@@ -76,7 +78,7 @@ class RecurringCronjob extends AbstractCronjobprivate function fireRecurring(): void{- app('log')->info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));+ Log::info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));$job = new CreateRecurringTransactions($this->date);$job->setForce($this->force);@@ -88,8 +90,8 @@ class RecurringCronjob extends AbstractCronjob$this->jobSucceeded = true;$this->message = 'Recurring transactions cron job fired successfully.';- app('fireflyconfig')->set('last_rt_job', (int) $this->date->format('U'));- app('log')->info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));- app('log')->info('Done with recurring cron job task.');+ FireflyConfig::set('last_rt_job', (int) $this->date->format('U'));+ Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));+ Log::info('Done with recurring cron job task.');}}diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.phpindex 832a020951..499b123602 100644--- a/app/Support/FireflyConfig.php+++ b/app/Support/FireflyConfig.php@@ -39,7 +39,7 @@ class FireflyConfig{public function delete(string $name): void{- $fullName = 'ff-config-'.$name;+ $fullName = 'ff3-config-'.$name;if (Cache::has($fullName)) {Cache::forget($fullName);}@@ -81,7 +81,7 @@ class FireflyConfig*/public function get(string $name, mixed $default = null): ?Configuration{- $fullName = 'ff-config-'.$name;+ $fullName = 'ff3-config-'.$name;if (Cache::has($fullName)) {return Cache::get($fullName);}diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.phpindex 672a84cfb6..52ce494418 100644--- a/app/Support/Http/Controllers/GetConfigurationData.php+++ b/app/Support/Http/Controllers/GetConfigurationData.php@@ -26,6 +26,7 @@ namespace FireflyIII\Support\Http\Controllers;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;+use FireflyIII\Support\Facades\FireflyConfig;use Illuminate\Support\Facades\Log;/**@@ -205,7 +206,7 @@ trait GetConfigurationDataprotected function verifyRecurringCronJob(): void{- $config = app('fireflyconfig')->get('last_rt_job', 0);+ $config = FireflyConfig::get('last_rt_job', 0);$lastTime = (int) $config?->data;$now = Carbon::now()->getTimestamp();app('log')->debug(sprintf('verifyRecurringCronJob: last time is %d ("%s"), now is %d', $lastTime, $config?->data, $now));