diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bbb68e..a6685d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +3.2.1 +===== + +* (improvement) Rename internal schedule to `TaskManagerInternalSchedule`. +* (improvement) Remove code, that was deprecated in `2.x`. + + 3.2.0 ===== diff --git a/src/DependencyInjection/TaskManagerBundleConfiguration.php b/src/DependencyInjection/TaskManagerBundleConfiguration.php index 602ca2f..30773dd 100644 --- a/src/DependencyInjection/TaskManagerBundleConfiguration.php +++ b/src/DependencyInjection/TaskManagerBundleConfiguration.php @@ -23,11 +23,6 @@ public function getConfigTreeBuilder () : TreeBuilder ->info("The list of queues to inspect. This list should be sorted by descending priority.") ->scalarPrototype()->end() ->end() - ->integerNode("log_ttl") - ->setDeprecated("21torr/task-manager", "2.2.0", "Use the `log.ttl` configuration instead.") - ->info("The max age of log entries, before they are automatically cleaned.") - ->defaultValue(28) - ->end() ->arrayNode("log") ->addDefaultsIfNotSet() ->children() diff --git a/src/DependencyInjection/TaskManagerBundleExtension.php b/src/DependencyInjection/TaskManagerBundleExtension.php index fb01c24..e83c5be 100644 --- a/src/DependencyInjection/TaskManagerBundleExtension.php +++ b/src/DependencyInjection/TaskManagerBundleExtension.php @@ -28,15 +28,8 @@ public function load (array $configs, ContainerBuilder $container) : void $container->getDefinition(BundleConfig::class) ->setArgument('$sortedQueues', $config["queues"]); - // if the new value was customized, use it. Otherwise keep using - // the old value. If none is set, they use the same default, so everything - // is fine. - $logTtl = 28 !== $config["log"]["ttl"] - ? $config["log"]["ttl"] - : $config["log_ttl"]; - $container->getDefinition(LogCleaner::class) - ->setArgument('$logTtlInDays', $logTtl) + ->setArgument('$logTtlInDays', $config["log"]["ttl"]) ->setArgument('$logMaxEntries', $config["log"]["max_entries"]); } diff --git a/src/Schedule/TaskManagerSchedule.php b/src/Schedule/TaskManagerInternalSchedule.php similarity index 56% rename from src/Schedule/TaskManagerSchedule.php rename to src/Schedule/TaskManagerInternalSchedule.php index a753002..5d74596 100644 --- a/src/Schedule/TaskManagerSchedule.php +++ b/src/Schedule/TaskManagerInternalSchedule.php @@ -3,25 +3,26 @@ namespace Torr\TaskManager\Schedule; use Symfony\Component\Scheduler\Attribute\AsSchedule; -use Symfony\Component\Scheduler\RecurringMessage; use Symfony\Component\Scheduler\Schedule; use Symfony\Component\Scheduler\ScheduleProviderInterface; use Torr\TaskManager\Log\Task\CleanOutdatedLogsTask; #[AsSchedule("task_manager")] -final readonly class TaskManagerSchedule implements ScheduleProviderInterface +final readonly class TaskManagerInternalSchedule implements ScheduleProviderInterface { + /** + */ + public function __construct ( + private TaskScheduler $scheduler, + ) {} + /** * */ public function getSchedule () : Schedule { - return (new Schedule()) - ->with( - RecurringMessage::cron( - "#daily", - new CleanOutdatedLogsTask(), - ), - ); + return $this->scheduler->createSchedule() + ->every("15 minutes", new CleanOutdatedLogsTask()) + ->getSchedule(); } }