clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11980 from annando/cooldown 

Use "maxloadavg" when "worker_load_cooldown" is not defined
This commit is contained in:
Tobias Diekershoff 2022-10-10 12:17:45 +02:00 committed by GitHub
parent a10f55bb85 a21c04d55d
commit c8406f6cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Worker.php
View File

@ -461,6 +461,10 @@ class Worker
$load_cooldown = DI::config()->get('system', 'worker_load_cooldown'); $load_cooldown = DI::config()->get('system', 'worker_load_cooldown');
$processes_cooldown = DI::config()->get('system', 'worker_processes_cooldown'); $processes_cooldown = DI::config()->get('system', 'worker_processes_cooldown');
if ($load_cooldown == 0) {
$load_cooldown = DI::config()->get('system', 'maxloadavg');
}
if (($load_cooldown == 0) && ($processes_cooldown == 0)) { if (($load_cooldown == 0) && ($processes_cooldown == 0)) {
return false; return false;
} }
@ -501,6 +505,10 @@ class Worker
$load_cooldown = DI::config()->get('system', 'worker_load_cooldown'); $load_cooldown = DI::config()->get('system', 'worker_load_cooldown');
$processes_cooldown = DI::config()->get('system', 'worker_processes_cooldown'); $processes_cooldown = DI::config()->get('system', 'worker_processes_cooldown');
if ($load_cooldown == 0) {
$load_cooldown = DI::config()->get('system', 'maxloadavg');
}
if (($load_cooldown == 0) && ($processes_cooldown == 0)) { if (($load_cooldown == 0) && ($processes_cooldown == 0)) {
return; return;
} }