Skip to content

Update RabbitMQQueue.php - priority option when sending a raw messages. #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update RabbitMQQueue.php - priority option when sending a raw messages. #618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions src/Queue/RabbitMQQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ function ($payload, $queue) {
*/
public function pushRaw($payload, $queue = null, array $options = []): int|string|null
{
[$destination, $exchange, $exchangeType, $attempts] = $this->publishProperties($queue, $options);
[$destination, $exchange, $exchangeType, $attempts, $priority] = $this->publishProperties($queue, $options);

$this->declareDestination($destination, $exchange, $exchangeType);

[$message, $correlationId] = $this->createMessage($payload, $attempts);
[$message, $correlationId] = $this->createMessage($payload, $attempts, $priority);

$this->publishBasic($message, $exchange, $destination, true);

Expand Down Expand Up @@ -164,14 +164,14 @@ public function laterRaw($delay, string $payload, $queue = null, int $attempts =
}

// Create a main queue to handle delayed messages
[$mainDestination, $exchange, $exchangeType, $attempts] = $this->publishProperties($queue, $options);
[$mainDestination, $exchange, $exchangeType, $attempts, $priority] = $this->publishProperties($queue, $options);
$this->declareDestination($mainDestination, $exchange, $exchangeType);

$destination = $this->getQueue($queue).'.delay.'.$ttl;

$this->declareQueue($destination, true, false, $this->getDelayQueueArguments($this->getQueue($queue), $ttl));

[$message, $correlationId] = $this->createMessage($payload, $attempts);
[$message, $correlationId] = $this->createMessage($payload, $attempts, $priority);

// Publish directly on the delayQueue, no need to publish through an exchange.
$this->publishBasic($message, null, $destination, true);
Expand Down Expand Up @@ -206,11 +206,11 @@ protected function publishBatch($jobs, $data = '', $queue = null): void
*/
public function bulkRaw(string $payload, string $queue = null, array $options = []): int|string|null
{
[$destination, $exchange, $exchangeType, $attempts] = $this->publishProperties($queue, $options);
[$destination, $exchange, $exchangeType, $attempts, $priority] = $this->publishProperties($queue, $options);

$this->declareDestination($destination, $exchange, $exchangeType);

[$message, $correlationId] = $this->createMessage($payload, $attempts);
[$message, $correlationId] = $this->createMessage($payload, $attempts, $priority);

$this->getChannel()->batch_basic_publish($message, $exchange, $destination);

Expand Down Expand Up @@ -511,11 +511,12 @@ public function reject(RabbitMQJob $job, bool $requeue = false): void
/**
* Create a AMQP message.
*/
protected function createMessage($payload, int $attempts = 0): array
protected function createMessage($payload, int $attempts = 0, int $priority = 0): array
{
$properties = [
'content_type' => 'application/json',
'delivery_mode' => AMQPMessage::DELIVERY_MODE_PERSISTENT,
'priority' => $priority
];

$currentPayload = json_decode($payload, true);
Expand All @@ -524,7 +525,7 @@ protected function createMessage($payload, int $attempts = 0): array
}

if ($this->getConfig()->isPrioritizeDelayed()) {
$properties['priority'] = $attempts;
$properties['priority'] += $attempts;
}

if (isset($currentPayload['data']['command'])) {
Expand Down Expand Up @@ -731,8 +732,9 @@ protected function publishProperties($queue, array $options = []): array
$destination = $this->getRoutingKey($queue);
$exchange = $this->getExchange(Arr::get($options, 'exchange'));
$exchangeType = $this->getExchangeType(Arr::get($options, 'exchange_type'));
$priority = Arr::get($options, 'priority') ?: 0;

return [$destination, $exchange, $exchangeType, $attempts];
return [$destination, $exchange, $exchangeType, $attempts, $priority];
}

protected function getConfig(): QueueConfig
Expand Down