Skip to content

Revert "[8.x] Prevent double throwing chained exception on sync queue" #43354

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
merged 1 commit into from
Jul 21, 2022
Merged

Revert "[8.x] Prevent double throwing chained exception on sync queue" #43354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 3 additions & 17 deletions src/Illuminate/Queue/SyncQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

class SyncQueue extends Queue implements QueueContract
{
protected $jobsCount = 0;

/**
* Get the size of the queue.
*
Expand All @@ -39,8 +37,6 @@ public function push($job, $data = '', $queue = null)
{
$queueJob = $this->resolveJob($this->createPayload($job, $queue, $data), $queue);

$this->jobsCount++;

try {
$this->raiseBeforeJobEvent($queueJob);

Expand All @@ -49,8 +45,6 @@ public function push($job, $data = '', $queue = null)
$this->raiseAfterJobEvent($queueJob);
} catch (Throwable $e) {
$this->handleException($queueJob, $e);
} finally {
$this->jobsCount--;
}

return 0;
Expand Down Expand Up @@ -119,19 +113,11 @@ protected function raiseExceptionOccurredJobEvent(Job $job, Throwable $e)
*/
protected function handleException(Job $queueJob, Throwable $e)
{
static $isGuarded = false;

if ($isGuarded) {
$isGuarded = false;
} else {
$isGuarded = $this->jobsCount > 1;
$this->raiseExceptionOccurredJobEvent($queueJob, $e);

$this->raiseExceptionOccurredJobEvent($queueJob, $e);
$queueJob->fail($e);

$queueJob->fail($e);

throw $e;
}
throw $e;
}

/**
Expand Down
54 changes: 4 additions & 50 deletions tests/Integration/Queue/JobChainingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class JobChainingTest extends TestCase
{
public static $catchCallbackCount = 0;
public static $catchCallbackRan = false;

protected function getEnvironmentSetUp($app)
{
Expand All @@ -30,6 +30,7 @@ protected function tearDown(): void
JobChainingTestFirstJob::$ran = false;
JobChainingTestSecondJob::$ran = false;
JobChainingTestThirdJob::$ran = false;
static::$catchCallbackRan = false;
}

public function testJobsCanBeChainedOnSuccess()
Expand Down Expand Up @@ -147,56 +148,19 @@ public function testThirdJobIsNotFiredIfSecondFails()

public function testCatchCallbackIsCalledOnFailure()
{
self::$catchCallbackCount = 0;

Bus::chain([
new JobChainingTestFirstJob,
new JobChainingTestFailingJob,
new JobChainingTestSecondJob,
])->catch(static function () {
self::$catchCallbackCount++;
self::$catchCallbackRan = true;
})->dispatch();

$this->assertTrue(JobChainingTestFirstJob::$ran);
$this->assertSame(1, static::$catchCallbackCount);
$this->assertTrue(static::$catchCallbackRan);
$this->assertFalse(JobChainingTestSecondJob::$ran);
}

public function testCatchCallbackIsCalledOnceOnSyncQueue()
{
self::$catchCallbackCount = 0;

try {
Bus::chain([
new JobChainingTestFirstJob(),
new JobChainingTestThrowJob(),
new JobChainingTestSecondJob(),
])->catch(function () {
self::$catchCallbackCount++;
})->onConnection('sync')->dispatch();
} finally {
$this->assertTrue(JobChainingTestFirstJob::$ran);
$this->assertSame(1, static::$catchCallbackCount);
$this->assertFalse(JobChainingTestSecondJob::$ran);
}

self::$catchCallbackCount = 0;

try {
Bus::chain([
new JobChainingTestFirstJob(),
new JobChainingTestThrowJob(),
new JobChainingTestSecondJob(),
])->catch(function () {
self::$catchCallbackCount++;
})->onConnection('sync')->dispatch();
} finally {
$this->assertTrue(JobChainingTestFirstJob::$ran);
$this->assertSame(1, static::$catchCallbackCount);
$this->assertFalse(JobChainingTestSecondJob::$ran);
}
}

public function testChainJobsUseSameConfig()
{
JobChainingTestFirstJob::dispatch()->allOnQueue('some_queue')->allOnConnection('sync1')->chain([
Expand Down Expand Up @@ -329,13 +293,3 @@ public function handle()
$this->fail();
}
}

class JobChainingTestThrowJob implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable;

public function handle()
{
throw new \Exception();
}
}