Some more places were we check now

diff --git a/boot.php b/boot.php
index d8b9cbf241fce7e58ba214e901e1d6f7b4cc99bb..99af7d3778c1012e3312647deac47eaf63388224 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1420,6 +1420,10 @@ class App {
 
                $cmdline = implode($args, " ");
 
+               if ($this->min_memory_reached()) {
+                       return;
+               }
+
                if (get_config('system', 'proc_windows')) {
                        $resource = proc_open('cmd /c start /b ' . $cmdline, array(), $foo, dirname(__FILE__));
                } else {

diff --git a/include/poller.php b/include/poller.php
index 9641819885d0e3dc4ed786eaf44ba8ecc40a3096..8f9f5aa24debfd6599916d713cdeb26f9c04db2e 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -71,6 +71,11 @@ function poller_run($argv, $argc){
 
        while ($r = poller_worker_process()) {
 
+               // Check free memory
+               if ($a->min_memory_reached()) {
+                       return;
+               }
+
                // Count active workers and compare them with a maximum value that depends on the load
                if (poller_too_much_workers()) {
                        return;