keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid the killing of the wrong process

Browse source
This commit is contained in:
Michael 2017-07-02 19:43:36 +00:00
parent 0cd9db9cb7
commit bae4569a0b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/poller.php
View file

@ -228,7 +228,7 @@ function poller_execute($queue) {
if (function_exists($funcname)) { if (function_exists($funcname)) {
// We constantly update the "executed" date every minute to avoid being killed to soon // We constantly update the "executed" date every minute to avoid being killed too soon
if (!isset($poller_last_update)) { if (!isset($poller_last_update)) {
$poller_last_update = strtotime($queue["executed"]); $poller_last_update = strtotime($queue["executed"]);
} }
@ -470,7 +470,7 @@ function poller_max_connections_reached() {
* *
*/ */
function poller_kill_stale_workers() { function poller_kill_stale_workers() {
$entries = dba::p("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0", NULL_DATE); $entries = dba::p("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0 ORDER BY `priority`, `created`", NULL_DATE);
while ($entry = dba::fetch($entries)) { while ($entry = dba::fetch($entries)) {
if (!posix_kill($entry["pid"], 0)) { if (!posix_kill($entry["pid"], 0)) {