Skip to content

Commit d44ed21

Browse files
authored
[8.x] Set chain queue when inside a batch (#35746)
* set chain copnnection when inside a batch * set chain connection from batch
1 parent 2ce11ab commit d44ed21

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/Illuminate/Bus/Batch.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,10 @@ public function add($jobs)
170170
$count += count($job);
171171

172172
return with($this->prepareBatchedChain($job), function ($chain) {
173-
return $chain->first()->chain($chain->slice(1)->values()->all());
173+
return $chain->first()
174+
->allOnQueue($this->options['queue'] ?? null)
175+
->allOnConnection($this->options['connection'] ?? null)
176+
->chain($chain->slice(1)->values()->all());
174177
});
175178
} else {
176179
$job->withBatchId($this->id);

tests/Bus/BusBatchTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ public function test_chain_can_be_added_to_batch()
332332

333333
$this->assertEquals(3, $batch->totalJobs);
334334
$this->assertEquals(3, $batch->pendingJobs);
335+
$this->assertEquals('test-queue', $chainHeadJob->chainQueue);
335336
$this->assertTrue(is_string($chainHeadJob->batchId));
336337
$this->assertTrue(is_string($secondJob->batchId));
337338
$this->assertTrue(is_string($thirdJob->batchId));

0 commit comments

Comments
 (0)