mexon/friendica
1
0
Fork 0
Code Pull requests Activity

The worker is now working

Browse source
This commit is contained in:
Michael Vogel 2015-09-10 23:10:31 +02:00
parent 17b1d45968
commit d3a6ebfe7e
5 changed files with 49 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boot.php
View file

@ -1433,6 +1433,8 @@ if(! function_exists('proc_run')) {
return; return;
if(count($args) && $args[0] === 'php') { if(count($args) && $args[0] === 'php') {
if (get_config("system", "worker")) {
$argv = $args; $argv = $args;
array_shift($argv); array_shift($argv);
@ -1447,7 +1449,8 @@ if(! function_exists('proc_run')) {
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval(0)); intval(0));
// return; 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');
} }

2
include/onepoll.php
View file

@ -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) {

19
include/poller.php
View file

@ -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();

6
include/socgraph.php
View file

@ -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"]));
} }
} }

31
include/worker.php
View file

@ -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"]));
} }
} }
?> ?>