From d8d2cdc6ef64daf83a23ee1eabe95e27e6bb051b Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 29 Aug 2020 13:01:58 +0000 Subject: [PATCH] Only c heck every 5 seconds for the system health --- src/Core/Worker.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Core/Worker.php b/src/Core/Worker.php index bbb6f57b2a..7758e06a90 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -91,7 +91,7 @@ class Worker self::runCron(); } - $starttime = time(); + $last_check = $starttime = time(); self::$state = self::STATE_STARTUP; // We fetch the next queue entry that is about to be executed @@ -120,7 +120,7 @@ class Worker } // To avoid the quitting of multiple workers only one worker at a time will execute the check - if (!self::getWaitingJobForPID()) { + if ((time() > $last_check + 5) && !self::getWaitingJobForPID()) { self::$state = self::STATE_LONG_LOOP; if (DI::lock()->acquire(self::LOCK_WORKER, 0)) { @@ -139,6 +139,7 @@ class Worker } DI::lock()->release(self::LOCK_WORKER); } + $last_check = time(); } // Quit the worker once every cron interval @@ -784,6 +785,7 @@ class Worker $stamp = (float)microtime(true); $count = DBA::count('process', ['command' => 'Worker.php']); self::$db_duration += (microtime(true) - $stamp); + self::$db_duration_count += (microtime(true) - $stamp); return $count; } @@ -807,6 +809,7 @@ class Worker DBA::close($queues); self::$db_duration += (microtime(true) - $stamp); + self::$db_duration_count += (microtime(true) - $stamp); return $ids; }