@@ -26,7 +26,6 @@ public function boot(): void
26
26
Queue::after (function (JobProcessed $ event ) {
27
27
$ connections = Config::get ('queue.connections ' );
28
28
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') {
30
29
$ queue = $ event ->job ->getQueue ();
31
30
32
31
$ queueId = explode ('/ ' , $ queue );
@@ -39,7 +38,7 @@ public function boot(): void
39
38
if ($ count === 1 ) {
40
39
$ event ->job ->delete ();
41
40
} else {
42
- $ this ->removeMessages ($ event ->job ->payload (), $ queue );
41
+ $ this ->removeMessages ($ event ->job ->payload (), $ queue, $ event -> connectionName );
43
42
}
44
43
}
45
44
});
@@ -57,24 +56,24 @@ public function register(): void
57
56
});
58
57
}
59
58
60
- private function removeMessages (array $ data , $ queue ): void
59
+ private function removeMessages (array $ data , $ queue, string $ connection ): void
61
60
{
62
61
$ batchIds = array_column ($ data ['data ' ], 'batchIds ' );
63
62
$ batchIds = array_chunk ($ batchIds , 10 );
64
63
65
- $ config = Config::get ('queue.connections.sqs-json ' );
64
+ $ config = Config::get ('queue.connections. ' . $ connection );
66
65
67
66
$ sqsClientConfig = [
68
67
//'profile' => 'default',
69
- 'region ' => Config::get ('queue.connections.sqs-json .region ' ),
68
+ 'region ' => Config::get ('queue.connections. ' . $ connection . ' .region ' ),
70
69
'version ' => '2012-11-05 ' ,
71
70
'http ' => [
72
71
'timeout ' => 30 ,
73
72
'connect_timeout ' => 30 ,
74
73
],
75
74
];
76
75
77
- if ($ config ['key ' ] && $ config ['secret ' ]) {
76
+ if (isset ( $ config ['key ' ], $ config ['secret ' ]) ) {
78
77
$ sqsClientConfig ['credentials ' ] = Arr::only ($ config , ['key ' , 'secret ' ]);
79
78
}
80
79
0 commit comments