Skip to content

Add timeout overrides #46

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

Merged
abnegate merged 2 commits into from
May 30, 2025
Merged

Add timeout overrides #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a48e3e4
Add timeout overrides
abnegate May 30, 2025
fe8d6dd
Format
abnegate May 30, 2025
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
21 changes: 15 additions & 6 deletions src/Queue/Broker/AMQP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public function __construct(
private readonly ?string $password = null,
private readonly string $vhost = '/',
private readonly int $heartbeat = 0,
private readonly float $connectTimeout = 3.0,
private readonly float $readWriteTimeout = 3.0,
) {
}

Expand Down Expand Up @@ -94,7 +96,7 @@ public function consume(Queue $queue, callable $messageCallback, callable $succe
$amqpMessage->nack(requeue: true);
$errorCallback($message ?? null, $e);
} catch (\Throwable $th) {
$amqpMessage->nack(requeue: false);
$amqpMessage->nack();
$errorCallback($message ?? null, $th);
}
};
Expand Down Expand Up @@ -129,9 +131,7 @@ public function consume(Queue $queue, callable $messageCallback, callable $succe

public function close(): void
{
if ($this->channel) {
$this->channel->getConnection()?->close();
}
$this->channel?->getConnection()?->close();
}

public function enqueue(Queue $queue, array $payload): bool
Expand Down Expand Up @@ -184,7 +184,16 @@ public function getQueueSize(Queue $queue, bool $failedJobs = false): int
private function withChannel(callable $callback): void
{
$createChannel = function (): AMQPChannel {
$connection = new AMQPStreamConnection($this->host, $this->port, $this->user, $this->password, $this->vhost, heartbeat: $this->heartbeat);
$connection = new AMQPStreamConnection(
$this->host,
$this->port,
$this->user,
$this->password,
$this->vhost,
connection_timeout: $this->connectTimeout,
read_write_timeout: $this->readWriteTimeout,
heartbeat: $this->heartbeat,
);
if (is_callable($this->connectionConfigHook)) {
call_user_func($this->connectionConfigHook, $connection);
}
Expand All @@ -201,7 +210,7 @@ private function withChannel(callable $callback): void

try {
$callback($this->channel);
} catch (\Throwable $th) {
} catch (\Throwable) {
// createChannel() might throw, in that case set the channel to `null` first.
$this->channel = null;
// try creating a new connection once, if this still fails, throw the error
Expand Down