bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6637 from annando/fix-jpm

Browse source 
Fix: Corected config value name
This commit is contained in:
Tobias Diekershoff 2019-02-11 09:57:27 +01:00 committed by GitHub
parent b5dcca995c 5fc6c0ef38
commit f786e8984f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/defaults.config.php
View file

@ -397,9 +397,9 @@ return [
// If enabled, it prints out the jobs per minute. // If enabled, it prints out the jobs per minute.
'worker_jpm' => false, 'worker_jpm' => false,
// worker_jpm_limit (String) // worker_jpm_range (String)
// List of minutes for the jobs per minute (JPM) calculation // List of minutes for the jobs per minute (JPM) calculation
'worker_jpm_limit' => '1, 10, 60', 'worker_jpm_range' => '1, 10, 60',
// worker_load_exponent (Integer) // worker_load_exponent (Integer)
// Default 3, which allows only 25% of the maximum worker queues when server load reaches around 37% of maximum load. // Default 3, which allows only 25% of the maximum worker queues when server load reaches around 37% of maximum load.

6
src/Core/Worker.php
View file

@ -718,6 +718,12 @@ class Worker
$intervals = explode(',', Config::get('system', 'worker_jpm_range')); $intervals = explode(',', Config::get('system', 'worker_jpm_range'));
$jobs_per_minute = []; $jobs_per_minute = [];
foreach ($intervals as $interval) { foreach ($intervals as $interval) {
if ($interval == 0) {
continue;
} else {
$interval = (int)$interval;
}
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
$jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ? MINUTE", $interval); $jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ? MINUTE", $interval);
self::$db_duration += (microtime(true) - $stamp); self::$db_duration += (microtime(true) - $stamp);