Skip to content
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

[12.x] feat: --memory=0 should mean skip memory exceeded verification (Breaking Change) #54393

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[12.x] feat: --memory=0 should mean skip memory exceeded verification (Breaking Change) #54393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbdc5b0
[12.x] feat: MemoryExceeded 0 should mean infinite memory
mathiasgrimm Jan 29, 2025
f7935f0
[12.x] feat: MemoryExceeded 0 should mean infinite memory
mathiasgrimm Jan 29, 2025
06c0695
[12.x] feat: MemoryExceeded 0 should mean infinite memory
mathiasgrimm Jan 29, 2025
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
2 changes: 1 addition & 1 deletion src/Illuminate/Queue/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ protected function supportsAsyncSignals()
*/
public function memoryExceeded($memoryLimit)
{
return (memory_get_usage(true) / 1024 / 1024) >= $memoryLimit;
return $memoryLimit > 0 && (memory_get_usage(true) / 1024 / 1024) >= $memoryLimit;
}

/**
Expand Down
18 changes: 18 additions & 0 deletions tests/Queue/QueueWorkerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,24 @@ public function testWorkerStopsWhenMemoryExceeded()
$this->events->shouldHaveReceived('dispatch')->with(m::type(JobProcessed::class))->once();
}

public function testWorkerMemoryExceededWhenMemoryIsZero()
{
$worker = new Worker(...$this->workerDependencies());
$this->assertFalse($worker->memoryExceeded(0));
}

public function testWorkerMemoryExceededWhenMemoryGreaterThanZero()
{
$worker = new Worker(...$this->workerDependencies());
$this->assertTrue($worker->memoryExceeded(1));
}

public function testWorkerMemoryExceededWhenMemoryIsNegative()
{
$worker = new Worker(...$this->workerDependencies());
$this->assertFalse($worker->memoryExceeded(-1));
}

public function testJobCanBeFiredBasedOnPriority()
{
$worker = $this->getWorker('default', [
Expand Down