Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
=====

Expand Down
5 changes: 0 additions & 5 deletions src/DependencyInjection/TaskManagerBundleConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
9 changes: 1 addition & 8 deletions src/DependencyInjection/TaskManagerBundleExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"]);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}