bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

proc_run was replaced

Browse source
This commit is contained in:
Michael 2017-11-05 12:15:53 +00:00
commit 478e363967
41 changed files with 167 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/Contact.php
View file

@ -2,6 +2,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Network\Probe;
// Included here for completeness, but this is a very dangerous operation.
@ -26,10 +27,10 @@ function user_remove($uid) {
// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid);
Worker::add(PRIORITY_HIGH, "notifier", "removeme", $uid);
// Send an update to the directory
proc_run(PRIORITY_LOW, "include/directory.php", $r['url']);
Worker::add(PRIORITY_LOW, "directory", $r['url']);
if($uid == local_user()) {
unset($_SESSION['authenticated']);
@ -60,7 +61,7 @@ function contact_remove($id) {
dba::delete('contact', array('id' => $id));
// Delete the rest in the background
proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
Worker::add(PRIORITY_LOW, 'remove_contact', $id);
}
@ -305,7 +306,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) &&
in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
Worker::add(PRIORITY_LOW, "update_gcontact", $profile["gid"]);
}
// Show contact details of Diaspora contacts only if connected

5
include/api.php
View file

@ -9,6 +9,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\Worker;
require_once 'include/HTTPExceptions.php';
require_once 'include/bbcode.php';
@ -3761,10 +3762,10 @@ $called_api = null;
//$user = api_get_user(get_app());
$url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
if ($url && strlen(get_config('system', 'directory'))) {
proc_run(PRIORITY_LOW, "include/directory.php", $url);
Worker::add(PRIORITY_LOW, "directory", $url);
}
proc_run(PRIORITY_LOW, 'include/profile_update.php', api_user());
Worker::add(PRIORITY_LOW, 'profile_update', api_user());
// output for client
if ($data) {

33
include/cron.php
View file

@ -1,6 +1,7 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\Worker;
function cron_run(&$argv, &$argc){
global $a;
@ -31,31 +32,31 @@ function cron_run(&$argv, &$argc){
logger('cron: start');
// run queue delivery process in the background
proc_run(PRIORITY_NEGLIGIBLE, "include/queue.php");
Worker::add(PRIORITY_NEGLIGIBLE, "queue");
// run the process to discover global contacts in the background
proc_run(PRIORITY_LOW, "include/discover_poco.php");
Worker::add(PRIORITY_LOW, "discover_poco");
// run the process to update locally stored global contacts in the background
proc_run(PRIORITY_LOW, "include/discover_poco.php", "checkcontact");
Worker::add(PRIORITY_LOW, "discover_poco", "checkcontact");
// Expire and remove user entries
proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "expire_and_remove_users");
Worker::add(PRIORITY_MEDIUM, "cronjobs", "expire_and_remove_users");
// Call possible post update functions
proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update");
Worker::add(PRIORITY_LOW, "cronjobs", "post_update");
// update nodeinfo data
proc_run(PRIORITY_LOW, "include/cronjobs.php", "nodeinfo");
Worker::add(PRIORITY_LOW, "cronjobs", "nodeinfo");
// Clear cache entries
proc_run(PRIORITY_LOW, "include/cronjobs.php", "clear_cache");
Worker::add(PRIORITY_LOW, "cronjobs", "clear_cache");
// Repair missing Diaspora values in contacts
proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_diaspora");
Worker::add(PRIORITY_LOW, "cronjobs", "repair_diaspora");
// Repair entries in the database
proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database");
Worker::add(PRIORITY_LOW, "cronjobs", "repair_database");
// once daily run birthday_updates and then expire in background
$d1 = get_config('system', 'last_expire_day');
@ -63,19 +64,19 @@ function cron_run(&$argv, &$argc){
if ($d2 != intval($d1)) {
proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays");
Worker::add(PRIORITY_LOW, "cronjobs", "update_contact_birthdays");
proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server");
Worker::add(PRIORITY_LOW, "discover_poco", "update_server");
proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
Worker::add(PRIORITY_LOW, "discover_poco", "suggestions");
set_config('system', 'last_expire_day', $d2);
proc_run(PRIORITY_LOW, 'include/expire.php');
Worker::add(PRIORITY_LOW, 'expire');
proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
Worker::add(PRIORITY_MEDIUM, 'dbclean');
proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums");
Worker::add(PRIORITY_LOW, "cronjobs", "update_photo_albums");
// Delete all done workerqueue entries
dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'));
@ -247,7 +248,7 @@ function cron_poll_contacts($argc, $argv) {
} else {
$priority = PRIORITY_LOW;
}
proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', (int)$contact['id']);
Worker::add(array('priority' => $priority, 'dont_fork' => true), 'onepoll', (int)$contact['id']);
}
}
}

3
include/cronhooks.php
View file

@ -1,6 +1,7 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\Worker;
function cronhooks_run(&$argv, &$argc) {
global $a;
@ -41,7 +42,7 @@ function cronhooks_run(&$argv, &$argc) {
if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
foreach ($a->hooks["cron"] as $hook) {
logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG);
proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
Worker::add(PRIORITY_MEDIUM, "cronhooks", $hook[1]);
}
}

5
include/dbclean.php
View file

@ -5,6 +5,7 @@
*/
use Friendica\Core\Config;
use Friendica\Core\Worker;
function dbclean_run(&$argv, &$argc) {
if (!Config::get('system', 'dbclean', false)) {
@ -25,7 +26,7 @@ function dbclean_run(&$argv, &$argc) {
// Execute the background script for a step when it isn't finished.
// Execute step 8 and 9 only when $days is defined.
if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($days > 0))) {
proc_run(PRIORITY_LOW, 'include/dbclean.php', $i);
Worker::add(PRIORITY_LOW, 'dbclean', $i);
}
}
} else {
@ -297,6 +298,6 @@ function remove_orphans($stage = 0) {
// Call it again if not all entries were purged
if (($stage != 0) && ($count > 0)) {
proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
Worker::add(PRIORITY_MEDIUM, 'dbclean');
}
}

7
include/dfrn.php
View file

@ -9,6 +9,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Worker;
require_once("include/Contact.php");
require_once("include/ostatus.php");
@ -2019,7 +2020,7 @@ class dfrn {
$changed = true;
if ($entrytype == DFRN_REPLY_RC) {
proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
Worker::add(PRIORITY_HIGH, "notifier","comment-import", $current["id"]);
}
}
@ -2652,7 +2653,7 @@ class dfrn {
if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $posted_id);
}
return true;
@ -2834,7 +2835,7 @@ class dfrn {
if ($entrytype == DFRN_REPLY_RC) {
logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
Worker::add(PRIORITY_HIGH, "notifier","drop", $item["id"]);
}
}
}

9
include/diaspora.php
View file

@ -12,6 +12,7 @@ use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/items.php';
@ -1605,7 +1606,7 @@ class Diaspora {
dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
// notify others
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
}
return true;
@ -1915,7 +1916,7 @@ class Diaspora {
dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
// notify others
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
}
return true;
@ -2191,7 +2192,7 @@ class Diaspora {
$i = item_store($arr);
if ($i)
proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
}
}
}
@ -2614,7 +2615,7 @@ class Diaspora {
// Now check if the retraction needs to be relayed by us
if ($parent["origin"]) {
// notify others
proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $item["id"]);
Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
}
}

3
include/directory.php
View file

@ -1,6 +1,7 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\Worker;
function directory_run(&$argv, &$argc){
$dir = Config::get('system', 'directory');
@ -37,7 +38,7 @@ function directory_update_all() {
if (dbm::is_result($r)) {
foreach ($r AS $user) {
proc_run(PRIORITY_LOW, 'include/directory.php', $user['url']);
Worker::add(PRIORITY_LOW, 'directory', $user['url']);
}
}
}

5
include/discover_poco.php
View file

@ -1,6 +1,7 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\Worker;
require_once 'include/probe.php';
require_once 'include/socgraph.php';
@ -118,7 +119,7 @@ function update_server() {
}
logger('Update server status for server '.$server["url"], LOGGER_DEBUG);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server["url"]);
Worker::add(PRIORITY_LOW, "discover_poco", "server", $server["url"]);
if (++$updated > 250) {
return;
@ -177,7 +178,7 @@ function discover_users() {
if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) {
logger('Check profile '.$user["url"]);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", $user["url"]);
Worker::add(PRIORITY_LOW, "discover_poco", "check_profile", $user["url"]);
if (++$checked > 100) {
return;

13
include/expire.php
View file

@ -1,6 +1,7 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\Worker;
function expire_run(&$argv, &$argc){
global $a;
@ -47,14 +48,14 @@ function expire_run(&$argv, &$argc){
logger('expire: start');
proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'include/expire.php', 'delete');
Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'expire', 'delete');
$r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
while ($row = dba::fetch($r)) {
logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG);
proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'include/expire.php', (int)$row['uid']);
Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'expire', (int)$row['uid']);
}
dba::close($r);
@ -63,8 +64,8 @@ function expire_run(&$argv, &$argc){
if (is_array($a->hooks) && array_key_exists('expire', $a->hooks)) {
foreach ($a->hooks['expire'] as $hook) {
logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'include/expire.php', 'hook', $hook[1]);
Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'expire', 'hook', $hook[1]);
}
}

3
include/follow.php
View file

@ -2,6 +2,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/probe.php';
@ -250,7 +251,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
// pull feed and consume it, which should subscribe to the hub.
proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
Worker::add(PRIORITY_HIGH, "onepoll", $contact_id, "force");
$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",

3
include/identity.php
View file

@ -5,6 +5,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Worker;
require_once 'include/ForumManager.php';
require_once 'include/bbcode.php';
@ -888,7 +889,7 @@ function zrl_init(App $a) {
return;
}
proc_run(PRIORITY_LOW, 'include/gprobe.php', $tmp_str);
Worker::add(PRIORITY_LOW, 'gprobe', $tmp_str);
$arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
call_hooks('zrl_init', $arr);
}

12
include/items.php
View file

@ -9,6 +9,7 @@ use Friendica\Core\System;
use Friendica\ParseUrl;
use Friendica\Util\Lock;
use Friendica\Core\Config;
use Friendica\Core\Worker;
require_once 'include/bbcode.php';
require_once 'include/oembed.php';
@ -1142,7 +1143,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
check_item_notification($current_post, $uid);
if ($notify) {
proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/notifier.php", $notify_type, $current_post);
Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "notifier", $notify_type, $current_post);
}
return $current_post;
@ -1425,7 +1426,7 @@ function tag_deliver($uid, $item_id) {
);
update_thread($item_id);
proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/notifier.php', 'tgroup', $item_id);
Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'notifier', 'tgroup', $item_id);
}
@ -2065,8 +2066,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
drop_item($item['id'], false);
}
proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/notifier.php", "expire", $uid);
Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "notifier", "expire", $uid);
}
/// @TODO type-hint is array
@ -2088,7 +2088,7 @@ function drop_items($items) {
// multiple threads may have been deleted, send an expire notification
if ($uid) {
proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/notifier.php", "expire", $uid);
Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "notifier", "expire", $uid);
}
}
@ -2280,7 +2280,7 @@ function drop_item($id, $interactive = true) {
$drop_id = intval($item['id']);
$priority = ($interactive ? PRIORITY_HIGH : PRIORITY_LOW);
proc_run(array('priority' => $priority, 'dont_fork' => true), "include/notifier.php", "drop", $drop_id);
Worker::add(array('priority' => $priority, 'dont_fork' => true), "notifier", "drop", $drop_id);
if (! $interactive) {
return $owner;

5
include/like.php
View file

@ -2,6 +2,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Worker;
require_once("include/diaspora.php");
@ -166,7 +167,7 @@ function do_like($item_id, $verb) {
);
$like_item_id = $like_item['id'];
proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $like_item_id);
Worker::add(PRIORITY_HIGH, "notifier", "like", $like_item_id);
if (!$event_verb_flag || $like_item['verb'] == $activity) {
return true;
@ -253,7 +254,7 @@ EOT;
call_hooks('post_local_end', $new_item);
proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $new_item_id);
Worker::add(PRIORITY_HIGH, "notifier", "like", $new_item_id);
return true;
}

3
include/message.php
View file

@ -4,6 +4,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Worker;
function send_message($recipient=0, $body='', $subject='', $replyto=''){
@ -143,7 +144,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
}
if ($post_id) {
proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
Worker::add(PRIORITY_HIGH, "notifier", "mail", $post_id);
return intval($post_id);
} else {
return -3;

17
include/notifier.php
View file

@ -2,6 +2,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Worker;
require_once 'include/queue_fn.php';
require_once 'include/html2plain.php';
@ -19,7 +20,7 @@ require_once 'include/salmon.php';
/*
* The notifier is typically called with:
*
* proc_run(PRIORITY_HIGH, "include/notifier.php", COMMAND, ITEM_ID);
* Worker::add(PRIORITY_HIGH, "notifier", COMMAND, ITEM_ID);
*
* where COMMAND is one of the following:
*
@ -375,7 +376,7 @@ function notifier_run(&$argv, &$argc){
// a delivery fork. private groups (forum_mode == 2) do not uplink
if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id);
Worker::add($a->queue['priority'], 'notifier', 'uplink', $item_id);
}
$conversants = array();
@ -514,8 +515,8 @@ function notifier_run(&$argv, &$argc){
}
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'delivery', $cmd, $item_id, (int)$contact['id']);
}
}
@ -579,8 +580,8 @@ function notifier_run(&$argv, &$argc){
if ((! $mail) && (! $fsuggest) && (! $followup)) {
logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'include/delivery.php', $cmd, $item_id, (int)$rr['id']);
Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
'delivery', $cmd, $item_id, (int)$rr['id']);
}
}
}
@ -599,8 +600,8 @@ function notifier_run(&$argv, &$argc){
logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
// Handling the pubsubhubbub requests
proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
'include/pubsubpublish.php');
Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
'pubsubpublish');
}
logger('notifier: calling hooks', LOGGER_DEBUG);

9
include/poller.php
View file

@ -42,6 +42,15 @@ function poller_run($argv, $argc) {
load_hooks();
// At first check the maximum load. We shouldn't continue with a high load
if ($a->maxload_reached()) {
logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
return;
}
// We now start the process. This is done after the load check since this could increase the load.
$a->start_process();
$run_cron = (($argc <= 1) || ($argv[1] != "no_cron"));
Worker::processQueue($run_cron);

5
include/pubsubpublish.php
View file

@ -3,6 +3,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\Worker;
require_once('include/items.php');
require_once('include/ostatus.php');
@ -19,8 +20,8 @@ function pubsubpublish_run(&$argv, &$argc){
foreach ($r as $rr) {
logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
'include/pubsubpublish.php', (int)$rr["id"]);
Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
'pubsubpublish', (int)$rr["id"]);
}
}

5
include/queue.php
View file

@ -1,6 +1,7 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\Worker;
require_once 'include/queue_fn.php';
require_once 'include/dfrn.php';
@ -27,7 +28,7 @@ function queue_run(&$argv, &$argc) {
logger('queue: start');
// Handling the pubsubhubbub requests
proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php');
Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
@ -52,7 +53,7 @@ function queue_run(&$argv, &$argc) {
if (dbm::is_result($r)) {
foreach ($r as $q_item) {
logger('Call queue for id '.$q_item['id']);
proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", (int)$q_item['id']);
Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "queue", (int)$q_item['id']);
}
}
return;

13
include/socgraph.php
View file

@ -10,6 +10,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/datetime.php';
@ -39,7 +40,7 @@ require_once 'include/Photo.php';
*/
function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
// Call the function "poco_load_worker" via the worker
proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
Worker::add(PRIORITY_LOW, "discover_poco", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
}
/**
@ -1702,7 +1703,7 @@ function poco_fetch_serverlist($poco) {
$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
if (!dbm::is_result($r)) {
logger("Call server check for server ".$server_url, LOGGER_DEBUG);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
Worker::add(PRIORITY_LOW, "discover_poco", "server", $server_url);
}
}
}
@ -1724,7 +1725,7 @@ function poco_discover_federation() {
$servers = json_decode($serverdata);
foreach ($servers->pods as $server) {
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
Worker::add(PRIORITY_LOW, "discover_poco", "server", "https://".$server->host);
}
}
@ -1737,7 +1738,7 @@ function poco_discover_federation() {
foreach ($servers as $server) {
$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
Worker::add(PRIORITY_LOW, "discover_poco", "server", $url);
}
}
}
@ -1847,7 +1848,7 @@ function poco_discover($complete = false) {
}
logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
Worker::add(PRIORITY_LOW, "discover_poco", "update_server_directory", (int)$server['id']);
if (!$complete && (--$no_of_queries == 0)) {
break;
@ -2125,7 +2126,7 @@ function get_gcontact_id($contact) {
if ($doprobing) {
logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
Worker::add(PRIORITY_LOW, 'gprobe', $contact["url"]);
}
return $gcontact_id;

3
include/uimport.php
View file

@ -3,6 +3,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
require_once("include/Photo.php");
define("IMPORT_DEBUG", False);
@ -284,7 +285,7 @@ function import_account(App $a, $file) {
}
// send relocate messages
proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
Worker::add(PRIORITY_HIGH, 'notifier', 'relocate', $newuid);
info(t("Done. You can now login with your username and password"));
goaway(System::baseUrl() . "/login");