From d487c399dd05e65b4b0990eb7c3ee86b4cc78e22 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Jun 2018 14:07:01 -0400 Subject: [PATCH] Standards: Rename App methods - Rename App->max_processes_reached to App->isMaxProcessesReached - Rename App->maxload_reached to App->isMaxLoadReached --- index.php | 2 +- src/App.php | 4 ++-- src/Core/Worker.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.php b/index.php index 3a2067471e..5da31f100e 100644 --- a/index.php +++ b/index.php @@ -42,7 +42,7 @@ if (!$a->mode == App::MODE_INSTALL) { Config::load(); - if ($a->max_processes_reached() || $a->maxload_reached()) { +if ($a->isMaxProcessesReached() || $a->isMaxLoadReached()) { header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable'); header('Retry-After: 120'); header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string); diff --git a/src/App.php b/src/App.php index 1eca4329f5..eca5c4b7db 100644 --- a/src/App.php +++ b/src/App.php @@ -972,7 +972,7 @@ class App * * @return bool Is the limit reached? */ - public function max_processes_reached() + public function isMaxProcessesReached() { // Deactivated, needs more investigating if this check really makes sense return false; @@ -1052,7 +1052,7 @@ class App * * @return bool Is the load reached? */ - public function maxload_reached() + public function isMaxLoadReached() { if ($this->is_backend()) { $process = 'backend'; diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 0d51bb725d..897a80111d 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -41,7 +41,7 @@ class Worker self::$up_start = microtime(true); // At first check the maximum load. We shouldn't continue with a high load - if ($a->maxload_reached()) { + if ($a->isMaxLoadReached()) { logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG); return; } @@ -75,7 +75,7 @@ class Worker } // Possibly there are too much database processes that block the system - if ($a->max_processes_reached()) { + if ($a->isMaxProcessesReached()) { logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); return; } @@ -203,7 +203,7 @@ class Worker } // Constantly check the number of parallel database processes - if ($a->max_processes_reached()) { + if ($a->isMaxProcessesReached()) { logger("Max processes reached for process ".$mypid, LOGGER_DEBUG); return false; } -- 2.39.5