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
10 changes: 8 additions & 2 deletions src/Queue/Broker/AMQP.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
use Utopia\Queue\Message;
use Utopia\Queue\Publisher;
use Utopia\Queue\Queue;
use Utopia\Queue\Result\Commit;
use Utopia\Queue\Result\NoCommit;

class AMQP implements Publisher, Consumer
{
Expand Down Expand Up @@ -81,8 +83,12 @@ public function consume(Queue $queue, callable $messageCallback, callable $succe
$nextMessage['timestamp'] = (int)$nextMessage['timestamp'];
$message = new Message($nextMessage);

$messageCallback($message);
$amqpMessage->ack();
$result = $messageCallback($message);
match (true) {
$result instanceof Commit => $amqpMessage->ack(true),
$result instanceof NoCommit => null,
default => $amqpMessage->ack()
};
$successCallback($message);
} catch (Retryable $e) {
$amqpMessage->nack(requeue: true);
Expand Down
5 changes: 4 additions & 1 deletion src/Queue/Consumer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

namespace Utopia\Queue;

use Utopia\Queue\Result\Commit;
use Utopia\Queue\Result\NoCommit;

interface Consumer
{
/**
* @param Queue $queue
* @param callable(Message $message): void $messageCallback
* @param callable(Message $message): Commit|NoCommit|mixed $messageCallback
* @param callable(Message $message): void $successCallback
* @param callable(Message $message, \Throwable $th): void $errorCallback
* @return void
Expand Down
7 changes: 7 additions & 0 deletions src/Queue/Result/Commit.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Utopia\Queue\Result;

class Commit
{
}
7 changes: 7 additions & 0 deletions src/Queue/Result/NoCommit.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Utopia\Queue\Result;

class NoCommit
{
}
2 changes: 1 addition & 1 deletion src/Queue/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function (Message $message) {
}
}

\call_user_func_array($this->job->getAction(), $this->getArguments($this->job, $message->getPayload()));
return \call_user_func_array($this->job->getAction(), $this->getArguments($this->job, $message->getPayload()));
} finally {
$processDuration = microtime(true) - $receivedAtTimestamp;
$this->processDuration->record($processDuration);
Expand Down