bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge branch 'develop' into 1706-lock

Browse source
This commit is contained in:
Michael Vogel 2017-06-06 14:16:00 +02:00 • committed by GitHub
commit f4652d6e50
31 changed files with 19040 additions and 7890 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/poller.php
View file

@ -391,7 +391,8 @@ function poller_kill_stale_workers() {
if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) {
$pid["priority"] = PRIORITY_MEDIUM;
}
// Define the maximum durations
// Define the maximum durations
$max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
$max_duration = $max_duration_defaults[$pid["priority"]];