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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
4.1.0
=====

* (feature) Show "uses sync transport" info per task.


4.0.0
=====

Expand Down
28 changes: 14 additions & 14 deletions src/Command/QueueTasksCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ protected function execute (InputInterface $input, OutputInterface $output) : in
$io = new TorrStyle($input, $output);
$io->title("Task Manager: Queue Task");

if ($this->receiverHelper->hasSyncTransport())
{
$io->caution("The app is using sync transports: that means that registered tasks are directly worked on.");
}

try
{
[$tasksToQueue, $taskPassedExplicitly] = $this->getTasksToQueue($input, $io);
Expand Down Expand Up @@ -172,21 +167,26 @@ private function fetchTasksByKey (array $keys) : array
private function formatTaskLabel (Task $task) : string
{
$metaData = $task->getMetaData();
$label = \sprintf(
"%s (<fg=yellow>%s</>)",
$metaData->label,
$metaData->getKey(),
);

if (null !== $metaData->group)
{
return \sprintf(
"<fg=blue>%s</>: %s (<fg=yellow>%s</>)",
$label = \sprintf(
"<fg=blue>%s</>: %s",
$metaData->group,
$metaData->label,
$metaData->getKey(),
$label,
);
}

return \sprintf(
"%s (<fg=yellow>%s</>)",
$metaData->label,
$metaData->getKey(),
);
if ($this->receiverHelper->usesSyncTransport($task))
{
$label = \sprintf("<fg=red>[sync]</> %s", $label);
}

return $label;
}
}
2 changes: 1 addition & 1 deletion src/Entity/TaskLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TaskLog

/** @var Collection<int, TaskRun> */
#[ORM\OneToMany(mappedBy: "taskLog", targetEntity: TaskRun::class, cascade: ["remove"], orphanRemoval: true)]
#[ORM\OrderBy(["timeStarted" => "asc"])]
#[ORM\OrderBy(["timeStarted" => "ASC"])]
public private(set) Collection $runs;

/**
Expand Down
32 changes: 32 additions & 0 deletions src/Transport/TransportsHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

namespace Torr\TaskManager\Transport;

use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Transport\Sender\SendersLocatorInterface;
use Symfony\Component\Messenger\Transport\Sync\SyncTransport;
use Symfony\Component\Messenger\Transport\TransportInterface;
use Torr\TaskManager\Config\BundleConfig;
use Torr\TaskManager\Exception\Transport\InvalidMessageTransportException;
use Torr\TaskManager\Task\Task;

/**
* Helper to interact with transports of the Symfony messenger component.
Expand All @@ -24,6 +28,8 @@ public function __construct (
/** @var ServiceLocator<TransportInterface> */
private ServiceLocator $transports,
private BundleConfig $bundleConfig,
#[Autowire(service: "messenger.senders_locator")]
private SendersLocatorInterface $sendersLocator,
) {}

/**
Expand All @@ -47,6 +53,32 @@ public function hasSyncTransport () : bool
return false;
}

/**
* @param Envelope|Task|object $message
*/
public function usesSyncTransport (object $message) : bool
{
if (!$message instanceof Envelope)
{
$message = new Envelope($message);
}

foreach ($this->sendersLocator->getSenders($message) as $name => $transport)
{
if (self::INTERNAL_TRANSPORT_NAME === $name)
{
continue;
}

if ($transport instanceof SyncTransport)
{
return true;
}
}

return false;
}

/**
* @return array<string, TransportInterface>
*/
Expand Down
7 changes: 6 additions & 1 deletion tests/Manager/TaskManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Symfony\Component\Messenger\Stamp\DeduplicateStamp;
use Symfony\Component\Messenger\Stamp\StampInterface;
use Symfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
use Symfony\Component\Messenger\Transport\Sender\SendersLocatorInterface;
use Symfony\Component\Messenger\Transport\TransportInterface;
use Torr\TaskManager\Config\BundleConfig;
use Torr\TaskManager\Manager\TaskManager;
Expand Down Expand Up @@ -79,7 +80,11 @@ private function createManager (array $transports, MessageBusInterface $bus) : T

$locator = new ServiceLocator($factories);
$config = new BundleConfig(sortedQueues: array_keys($transports));
$helper = new TransportsHelper($locator, $config);
$helper = new TransportsHelper(
$locator,
$config,
self::createStub(SendersLocatorInterface::class),
);

return new TaskManager($helper, $bus);
}
Expand Down
7 changes: 6 additions & 1 deletion tests/Transport/TransportsHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\Messenger\Transport\Sender\SendersLocatorInterface;
use Torr\TaskManager\Config\BundleConfig;
use Torr\TaskManager\Transport\TransportsHelper;

Expand Down Expand Up @@ -33,7 +34,11 @@ public function testOrderedTransports () : void
"scheduler_3" => static fn () => null,
]);

$helper = new TransportsHelper($locator, $config);
$helper = new TransportsHelper(
$locator,
$config,
self::createStub(SendersLocatorInterface::class),
);

self::assertSame([
"scheduler_1",
Expand Down
Loading