The worker is now working
This commit is contained in:
parent
17b1d45968
commit
d3a6ebfe7e
27
boot.php
27
boot.php
|
@ -1433,21 +1433,24 @@ if(! function_exists('proc_run')) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(count($args) && $args[0] === 'php') {
|
if(count($args) && $args[0] === 'php') {
|
||||||
$argv = $args;
|
|
||||||
array_shift($argv);
|
|
||||||
|
|
||||||
$parameters = json_encode($argv);
|
if (get_config("system", "worker")) {
|
||||||
$found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
|
$argv = $args;
|
||||||
dbesc($parameters));
|
array_shift($argv);
|
||||||
|
|
||||||
if (!$found)
|
$parameters = json_encode($argv);
|
||||||
q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
|
$found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
|
||||||
VALUES ('%s', '%s', %d)",
|
dbesc($parameters));
|
||||||
dbesc($parameters),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval(0));
|
|
||||||
|
|
||||||
// return;
|
if (!$found)
|
||||||
|
q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
|
||||||
|
VALUES ('%s', '%s', %d)",
|
||||||
|
dbesc($parameters),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval(0));
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
|
$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
|
||||||
}
|
}
|
||||||
|
|
|
@ -360,7 +360,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
);
|
);
|
||||||
logger("Mail: Connected to " . $mailconf[0]['user']);
|
logger("Mail: Connected to " . $mailconf[0]['user']);
|
||||||
} else
|
} else
|
||||||
logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors()));
|
logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors(), true));
|
||||||
}
|
}
|
||||||
if($mbox) {
|
if($mbox) {
|
||||||
|
|
||||||
|
|
|
@ -75,22 +75,6 @@ function poller_run(&$argv, &$argc){
|
||||||
|
|
||||||
logger('poller: start');
|
logger('poller: start');
|
||||||
|
|
||||||
// run queue delivery process in the background
|
|
||||||
|
|
||||||
proc_run('php',"include/queue.php");
|
|
||||||
|
|
||||||
// run diaspora photo queue process in the background
|
|
||||||
|
|
||||||
proc_run('php',"include/dsprphotoq.php");
|
|
||||||
|
|
||||||
// run the process to discover global contacts in the background
|
|
||||||
|
|
||||||
proc_run('php',"include/discover_poco.php");
|
|
||||||
|
|
||||||
// run the process to update locally stored global contacts in the background
|
|
||||||
|
|
||||||
proc_run('php',"include/discover_poco.php", "checkcontact");
|
|
||||||
|
|
||||||
// expire any expired accounts
|
// expire any expired accounts
|
||||||
|
|
||||||
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
|
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
|
||||||
|
@ -119,7 +103,8 @@ function poller_run(&$argv, &$argc){
|
||||||
check_conversations(false);
|
check_conversations(false);
|
||||||
|
|
||||||
// Follow your friends from your legacy OStatus account
|
// Follow your friends from your legacy OStatus account
|
||||||
ostatus_check_follow_friends();
|
// Doesn't work
|
||||||
|
// ostatus_check_follow_friends();
|
||||||
|
|
||||||
// update nodeinfo data
|
// update nodeinfo data
|
||||||
nodeinfo_cron();
|
nodeinfo_cron();
|
||||||
|
|
|
@ -1338,8 +1338,10 @@ function poco_discover($complete = false) {
|
||||||
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
|
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
|
||||||
if (!$complete AND (--$no_of_queries == 0))
|
if (!$complete AND (--$no_of_queries == 0))
|
||||||
break;
|
break;
|
||||||
} else // If the server hadn't replied correctly, then force a sanity check
|
// If the server hadn't replied correctly, then force a sanity check
|
||||||
poco_check_server($server["url"], $server["network"], true);
|
} elseif (!poco_check_server($server["url"], $server["network"], true))
|
||||||
|
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,25 @@ if(is_null($db)) {
|
||||||
unset($db_host, $db_user, $db_pass, $db_data);
|
unset($db_host, $db_user, $db_pass, $db_data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// run queue delivery process in the background
|
||||||
|
|
||||||
|
proc_run('php',"include/queue.php");
|
||||||
|
|
||||||
|
// run diaspora photo queue process in the background
|
||||||
|
|
||||||
|
proc_run('php',"include/dsprphotoq.php");
|
||||||
|
|
||||||
|
// run the process to discover global contacts in the background
|
||||||
|
|
||||||
|
proc_run('php',"include/discover_poco.php");
|
||||||
|
|
||||||
|
// run the process to update locally stored global contacts in the background
|
||||||
|
|
||||||
|
proc_run('php',"include/discover_poco.php", "checkcontact");
|
||||||
|
|
||||||
|
// When everything else is done ...
|
||||||
|
proc_run("php","include/poller.php");
|
||||||
|
|
||||||
// Cleaning killed processes
|
// Cleaning killed processes
|
||||||
$r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
|
$r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
|
||||||
foreach($r AS $pid)
|
foreach($r AS $pid)
|
||||||
|
@ -36,9 +55,12 @@ foreach($r AS $pid)
|
||||||
// Checking number of workers
|
// Checking number of workers
|
||||||
$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
|
$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
|
||||||
|
|
||||||
$threads = 3;
|
$queues = intval(get_config("system", "worker_queues"));
|
||||||
|
|
||||||
if ($workers[0]["workers"] >= $threads)
|
if ($queues == 0)
|
||||||
|
$queues = 4;
|
||||||
|
|
||||||
|
if ($workers[0]["workers"] >= $queues)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
|
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
|
||||||
|
@ -58,11 +80,12 @@ while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:
|
||||||
|
|
||||||
if (function_exists($funcname)) {
|
if (function_exists($funcname)) {
|
||||||
logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
|
logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
|
||||||
//$funcname($argv, $argc);
|
$funcname($argv, $argc);
|
||||||
sleep(10);
|
//sleep(10);
|
||||||
logger("Process ".getmypid().": ".$funcname." - done");
|
logger("Process ".getmypid().": ".$funcname." - done");
|
||||||
|
|
||||||
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
|
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue