Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 1de4d3b953414319548ac13ffdbad3f1eb906deb..870a5dfb248b2fa22be662ada9a8aac31f27c88e 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -62,7 +62,7 @@ class Worker
                }
 
                // Do we have too few memory?
-               if ($a->min_memory_reached()) {
+               if ($a->isMinMemoryReached()) {
                        logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG);
                        return;
                }
@@ -117,12 +117,14 @@ class Worker
                                // Count active workers and compare them with a maximum value that depends on the load
                                if (self::tooMuchWorkers()) {
                                        logger('Active worker limit reached, quitting.', LOGGER_DEBUG);
+                                       Lock::release('worker');
                                        return;
                                }
 
                                // Check free memory
-                               if ($a->min_memory_reached()) {
+                               if ($a->isMinMemoryReached()) {
                                        logger('Memory limit reached, quitting.', LOGGER_DEBUG);
+                                       Lock::release('worker');
                                        return;
                                }
                                Lock::release('worker');
@@ -1011,7 +1013,7 @@ class Worker
        {
                $command = 'bin/worker.php';
 
-               $args = [ 'cron' => $do_cron ];
+               $args = ['no_cron' => !$do_cron];
 
                get_app()->proc_run($command, $args);