Merge commit '3907a2b6ba58fa49022e3e7c8256731dfa2e0d00'

This commit is contained in:
Dylan K. Taylor
2020-03-14 13:32:35 +00:00
6 changed files with 13 additions and 11 deletions

View File

@ -230,7 +230,7 @@ class MemoryManager{
if(($this->memoryLimit > 0 or $this->globalMemoryLimit > 0) and ++$this->checkTicker >= $this->checkRate){
$this->checkTicker = 0;
$memory = Process::getMemoryUsage(true);
$memory = Process::getAdvancedMemoryUsage();
$trigger = false;
if($this->memoryLimit > 0 and $memory[0] > $this->memoryLimit){
$trigger = 0;