diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/SettingsHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/SettingsHandler.php index d48aade..7bb420d 100755 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/SettingsHandler.php +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/SettingsHandler.php @@ -170,9 +170,9 @@ class SettingsHandler // For now, let's use global retrieval via cache if possible, or assume it's injected. // But wait, getLastCronRunDate logic was in controller. // SchedulerService stores last run in cache. We have $this->cache here. - + $lastRunTimestamp = $this->cache->get("scheduler.global_last_run"); - + if ($lastRunTimestamp) { return date('d.m.Y H:i:s', (int)$lastRunTimestamp); } diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/ScheduleJobRegistry.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/ScheduleJobRegistry.php index cd886be..4b04bc8 100755 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/ScheduleJobRegistry.php +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/ScheduleJobRegistry.php @@ -37,4 +37,3 @@ class ScheduleJobRegistry return $this->jobs; } } - diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerResult.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerResult.php index 0f26894..753a694 100755 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerResult.php +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerResult.php @@ -41,4 +41,3 @@ class SchedulerResult ]; } } - diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerService.php index de3d0cf..1c25df0 100755 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerService.php +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/SchedulerService.php @@ -45,7 +45,7 @@ class SchedulerService $this->acquireGlobalLock(); // Since we want to run every 5 minutes, running it more frequently won't trigger jobs earlier than due, // but locking might prevent overlap if previous run takes > 5 mins. - // However, updating global last run on every attempt might be useful for diagnostics, + // However, updating global last run on every attempt might be useful for diagnostics, // but strictly speaking, we only care if tasks were processed. $this->updateGlobalLastRun(); @@ -105,10 +105,9 @@ class SchedulerService $duration = microtime(true) - $startTime; $this->updateLastRun($id); - + $this->logger->info("Job executed: {$name}", ['duration' => $duration]); $result->addExecuted($name, $duration); - } catch (Throwable $e) { $this->updateLastFailure($id, $e->getMessage()); $this->logger->error("Job failed: {$name}", ['exception' => $e]); @@ -116,7 +115,6 @@ class SchedulerService } finally { $this->unlockJob($id); } - } catch (Throwable $e) { $this->logger->error("Error processing job {$name}: " . $e->getMessage()); $result->addFailed($name, 'Processing error: ' . $e->getMessage()); @@ -146,7 +144,7 @@ class SchedulerService private function lockJob(string $id): void { // 30 minutes max execution time for a single job safe-guard - $this->cache->set("scheduler.lock.{$id}", 1, 1800); + $this->cache->set("scheduler.lock.{$id}", 1, 1800); } private function unlockJob(string $id): void @@ -163,7 +161,7 @@ class SchedulerService $lastRunDate = (new DateTime())->setTimestamp((int)$lastRun); $now = new DateTime(); - + return $lastRunDate->format('Y-m-d H:i') === $now->format('Y-m-d H:i'); } diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/TaskInterface.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/TaskInterface.php index 6243f74..4d43b5c 100755 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/TaskInterface.php +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Scheduler/TaskInterface.php @@ -6,4 +6,3 @@ interface TaskInterface { public function execute(): void; } - diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/phpstan.neon b/module/oc_telegram_shop/upload/oc_telegram_shop/phpstan.neon index 220bbb3..4579bbf 100644 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/phpstan.neon +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/phpstan.neon @@ -4,6 +4,7 @@ parameters: - src - bastion - framework + - console scanDirectories: - stubs