Skip to content

Commit 01b8125

Browse files
committed
Support multiple connection properly
1 parent 3221c2b commit 01b8125

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/SqsQueueReaderServiceProvider.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public function boot(): void
2626
Queue::after(function (JobProcessed $event) {
2727
$connections = Config::get('queue.connections');
2828
if (in_array($event->connectionName, array_keys($connections), true)) {
29-
//if ($event->connectionName === 'sqs-json' || $event->connectionName === 'sqs-mailgun' || $event->connectionName === 'sqs-external-customer-webhook' || $event->connectionName === 'sqs-priority-json') {
3029
$queue = $event->job->getQueue();
3130

3231
$queueId = explode('/', $queue);
@@ -39,7 +38,7 @@ public function boot(): void
3938
if ($count === 1) {
4039
$event->job->delete();
4140
} else {
42-
$this->removeMessages($event->job->payload(), $queue);
41+
$this->removeMessages($event->job->payload(), $queue, $event->connectionName);
4342
}
4443
}
4544
});
@@ -57,24 +56,24 @@ public function register(): void
5756
});
5857
}
5958

60-
private function removeMessages(array $data, $queue): void
59+
private function removeMessages(array $data, $queue, string $connection): void
6160
{
6261
$batchIds = array_column($data['data'], 'batchIds');
6362
$batchIds = array_chunk($batchIds, 10);
6463

65-
$config = Config::get('queue.connections.sqs-json');
64+
$config = Config::get('queue.connections.' . $connection);
6665

6766
$sqsClientConfig = [
6867
//'profile' => 'default',
69-
'region' => Config::get('queue.connections.sqs-json.region'),
68+
'region' => Config::get('queue.connections.' . $connection . '.region'),
7069
'version' => '2012-11-05',
7170
'http' => [
7271
'timeout' => 30,
7372
'connect_timeout' => 30,
7473
],
7574
];
7675

77-
if ($config['key'] && $config['secret']) {
76+
if (isset($config['key'], $config['secret'])) {
7877
$sqsClientConfig['credentials'] = Arr::only($config, ['key', 'secret']);
7978
}
8079

0 commit comments

Comments
 (0)