fixed running cron module when memory limit set to -1

shopsys · Dec 27, 2023 · 30167cb · 30167cb
1 parent a33240e
commit 30167cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Component/Cron/CronModuleExecutor.php b/src/Component/Cron/CronModuleExecutor.php
@@ -85,8 +85,9 @@ public function canRun(CronModuleConfig $cronConfig): bool
         );
 
         $memoryUsage = memory_get_usage(true);
+        $memoryLimit = BytesHelper::getPhpMemoryLimitInBytes();
 
-        if ($memoryUsage >= BytesHelper::getPhpMemoryLimitInBytes() * 0.9) {
+        if ($memoryLimit !== -1 && $memoryUsage >= $memoryLimit * 0.9) {
             $this->logger->info('Cron was running out of memory, so it was put to sleep to prevent failure.');
 
             return false;

diff --git a/tests/Unit/Component/Bytes/BytesHelperTest.php b/tests/Unit/Component/Bytes/BytesHelperTest.php
@@ -25,6 +25,7 @@ public function testConvertPhpStringByteDefinitionToBytes(string $phpStringBytes
     public function phpStringBytesToBytesDataProvider(): array
     {
         return [
+            ['phpStringBytes' => '-1', 'expectedBytes' => -1],
             ['phpStringBytes' => '12', 'expectedBytes' => 12],
             ['phpStringBytes' => '12K', 'expectedBytes' => 12288],
             ['phpStringBytes' => '12M', 'expectedBytes' => 12582912],