@@ -19,43 +19,44 @@ public function boot(): void
1919 ], 'config ' );
2020
2121 Queue::after (static function (JobProcessed $ event ) {
22- $ queue = $ event ->job ->getQueue ();
23- Log::debug ('$queue= ' , [$ queue , $ event ->connectionName ]);
24- $ queueId = explode ('/ ' , $ queue );
25- $ queueId = array_pop ($ queueId );
26- $ data = $ event ->job ->payload ();
27- Log::debug ('Job payload== ' , [$ data ]);
28- $ count = (array_key_exists ($ queueId , Config::get ('sqs-queue-reader.handlers ' )))
29- ? Config::get ('sqs-queue-reader.handlers ' )[$ queueId ]['count ' ]
30- : Config::get ('sqs-queue-reader.default-handler ' )['count ' ];
22+ if ($ event ->connectionName === 'sqs-json ' ) {
23+ $ queue = $ event ->job ->getQueue ();
3124
32- if ($ count === 1 ) {
33- $ event ->job ->delete ();
34- } else {
35- $ data = $ event ->job ->payload ();
36- Log::debug ('Job payload== ' , [$ data ]);
25+ $ queueId = explode ('/ ' , $ queue );
26+ $ queueId = array_pop ($ queueId );
3727
38- $ batchIds = array_column ($ data , 'batchIds ' );
28+ $ count = (array_key_exists ($ queueId , Config::get ('sqs-queue-reader.handlers ' )))
29+ ? Config::get ('sqs-queue-reader.handlers ' )[$ queueId ]['count ' ]
30+ : Config::get ('sqs-queue-reader.default-handler ' )['count ' ];
3931
40- $ batchIds = array_chunk ($ batchIds , 10 );
32+ if ($ count === 1 ) {
33+ $ event ->job ->delete ();
34+ } else {
35+ $ data = $ event ->job ->payload ();
36+ Log::debug ('Job payload== ' , [$ data ]);
4137
42- foreach ($ batchIds as $ batch ) {
43- //Deletes up to ten messages from the specified queue.
44- $ result = $ event ->job ->deleteMessageBatch ([
45- 'Entries ' => $ batch ,
46- 'QueueUrl ' => $ queue ,
47- ]);
38+ $ batchIds = array_column ($ data , 'batchIds ' );
39+ Log::debug ('Job array_column== ' , [$ data ]);
40+ $ batchIds = array_chunk ($ batchIds , 10 );
41+ Log::debug ('Job array_chunk== ' , [$ data ]);
42+ foreach ($ batchIds as $ batch ) {
43+ //Deletes up to ten messages from the specified queue.
44+ $ result = $ event ->job ->deleteMessageBatch ([
45+ 'Entries ' => $ batch ,
46+ 'QueueUrl ' => $ queue ,
47+ ]);
4848
49- if (isset ($ result ['Failed ' ])) {
50- $ msg = '' ;
51- foreach ($ result ['Failed ' ] as $ failed ) {
52- $ msg .= sprintf ("Deleting message failed, code = %s, id = %s, msg = %s, senderfault = %s " , $ failed ['Code ' ], $ failed ['Id ' ], $ failed ['Message ' ], $ failed ['SenderFault ' ]);
53- }
54- Log::error ('Cannot delete some SQS messages: ' , [$ msg ]);
49+ if (isset ($ result ['Failed ' ])) {
50+ $ msg = '' ;
51+ foreach ($ result ['Failed ' ] as $ failed ) {
52+ $ msg .= sprintf ("Deleting message failed, code = %s, id = %s, msg = %s, senderfault = %s " , $ failed ['Code ' ], $ failed ['Id ' ], $ failed ['Message ' ], $ failed ['SenderFault ' ]);
53+ }
54+ Log::error ('Cannot delete some SQS messages: ' , [$ msg ]);
5555
56- throw new \RuntimeException ("Cannot delete some messages, consult log for more info! " );
56+ throw new \RuntimeException ("Cannot delete some messages, consult log for more info! " );
57+ }
58+ Log::info ('Message remove report: ' , [$ result ]);
5759 }
58- Log::info ('Message remove report: ' , [$ result ]);
5960 }
6061 }
6162 });
0 commit comments