MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4254 from zeroadam/Queue-#3878

Browse source 
Move queue_fn to src
This commit is contained in:
Hypolite Petovan 2018-01-15 20:53:17 -05:00 committed by GitHub
parent 286811357a c98e558372
commit b505f0d4d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 121 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
include/queue_fn.php
View file

@ -1,84 +0,0 @@
<?php
use Friendica\Core\Config;
use Friendica\Database\DBM;
function update_queue_time($id) {
logger('queue: requeue item ' . $id);
q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
intval($id)
);
}
function remove_queue_item($id) {
logger('queue: remove queue item ' . $id);
dba::delete('queue', ['id' => $id]);
}
/**
* @brief Checks if the communication with a given contact had problems recently
*
* @param int $cid Contact id
*
* @return bool The communication with this contact has currently problems
*/
function was_recently_delayed($cid) {
// Are there queue entries that were recently added?
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
intval($cid)
);
$was_delayed = DBM::is_result($r);
// We set "term-date" to a current date if the communication has problems.
// If the communication works again we reset this value.
if ($was_delayed) {
$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
intval($cid)
);
$was_delayed = !DBM::is_result($r);
}
return $was_delayed;
}
function add_to_queue($cid,$network,$msg,$batch = false) {
$max_queue = Config::get('system','max_contact_queue');
if ($max_queue < 1) {
$max_queue = 500;
}
$batch_queue = Config::get('system','max_batch_queue');
if ($batch_queue < 1) {
$batch_queue = 1000;
}
$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
intval($cid)
);
if (DBM::is_result($r)) {
if ($batch && ($r[0]['total'] > $batch_queue)) {
logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
return;
} elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
return;
}
}
q("INSERT INTO `queue` ( `cid`, `network`, `created`, `last`, `content`, `batch`)
VALUES ( %d, '%s', '%s', '%s', '%s', %d) ",
intval($cid),
dbesc($network),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($msg),
intval(($batch) ? 1: 0)
);
}

99
src/Model/Queue.php Normal file
View file

@ -0,0 +1,99 @@
<?php
/**
* @file src/Model/Queue.php
*/
namespace Friendica\Model;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use dba;
require_once 'include/dba.php';
require_once 'include/datetime.php';
class Queue
{
/**
* @param string $id id
*/
public static function updateTime($id)
{
logger('queue: requeue item ' . $id);
dba::update('queue', ['last' => datetime_convert()], ['id' => $id]);
}
/**
* @param string $id id
*/
public static function removeItem($id)
{
logger('queue: remove queue item ' . $id);
dba::delete('queue', ['id' => $id]);
}
/**
* @brief Checks if the communication with a given contact had problems recently
*
* @param int $cid Contact id
*
* @return bool The communication with this contact has currently problems
*/
public static function wasDelayed($cid)
{
// Are there queue entries that were recently added?
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
intval($cid)
);
$was_delayed = DBM::is_result($r);
// We set "term-date" to a current date if the communication has problems.
// If the communication works again we reset this value.
if ($was_delayed) {
$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
intval($cid)
);
$was_delayed = !DBM::is_result($r);
}
return $was_delayed;
}
/**
* @param string $cid cid
* @param string $network network
* @param string $msg message
* @param boolean $batch batch, default false
*/
public static function add($cid, $network, $msg, $batch = false)
{
$max_queue = Config::get('system', 'max_contact_queue');
if ($max_queue < 1) {
$max_queue = 500;
}
$batch_queue = Config::get('system', 'max_batch_queue');
if ($batch_queue < 1) {
$batch_queue = 1000;
}
$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
intval($cid)
);
if (DBM::is_result($r)) {
if ($batch && ($r[0]['total'] > $batch_queue)) {
logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
return;
} elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
return;
}
}
dba::insert('queue', ['cid' => $cid, 'network' => $network, 'created' => datetime_convert(), 'last' => datetime_convert(), 'content' => $msg, 'batch' =>($batch) ? 1 : 0]);
}
}

8
src/Protocol/Diaspora.php
View file

@ -20,6 +20,7 @@ use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Profile;
use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
@ -32,7 +33,6 @@ require_once 'include/dba.php';
require_once 'include/items.php';
require_once 'include/bb2diaspora.php';
require_once 'include/datetime.php';
require_once 'include/queue_fn.php';
/**
* @brief This class contain functions to create and send Diaspora XML files
@ -3224,7 +3224,7 @@ class Diaspora
logger("transmit: ".$logid."-".$guid." ".$dest_url);
if (!$queue_run && was_recently_delayed($contact["id"])) {
if (!$queue_run && Queue::wasDelayed($contact["id"])) {
$return_code = 0;
} else {
if (!intval(Config::get("system", "diaspora_test"))) {
@ -3254,7 +3254,7 @@ class Diaspora
logger("add_to_queue ignored - identical item already in queue");
} else {
// queue message for redelivery
add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);
@ -3311,7 +3311,7 @@ class Diaspora
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
return true;
} else {
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);

9
src/Worker/Delivery.php
View file

@ -2,7 +2,6 @@
/**
* @file src/Worker/Delivery.php
*/
namespace Friendica\Worker;
use Friendica\App;
@ -10,13 +9,13 @@ use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Email;
use dba;
require_once 'include/queue_fn.php';
require_once 'include/html2plain.php';
require_once 'include/datetime.php';
require_once 'include/items.php';
@ -335,8 +334,8 @@ class Delivery {
}
}
if (!was_recently_delayed($contact['id'])) {
$deliver_status = DFRN::deliver($owner,$contact,$atom);
if (!Queue::wasDelayed($contact['id'])) {
$deliver_status = DFRN::deliver($owner, $contact, $atom);
} else {
$deliver_status = (-1);
}
@ -345,7 +344,7 @@ class Delivery {
if ($deliver_status < 0) {
logger('notifier: delivery failed: queuing message');
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
Queue::add($contact['id'], NETWORK_DFRN, $atom);
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);

1
src/Worker/Notifier.php
View file

@ -17,7 +17,6 @@ use Friendica\Protocol\Salmon;
use dba;
require_once 'include/dba.php';
require_once 'include/queue_fn.php';
require_once 'include/html2plain.php';
require_once 'include/datetime.php';
require_once 'include/items.php';

3
src/Worker/OnePoll.php
View file

@ -14,14 +14,13 @@ use dba;
require_once 'include/dba.php';
Class OnePoll
class OnePoll
{
public static function execute($contact_id = 0, $command = '') {
global $a;
require_once 'include/datetime.php';
require_once 'include/items.php';
require_once 'include/queue_fn.php';
logger('start');

26
src/Worker/Queue.php
View file

@ -8,6 +8,7 @@ use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Queue;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\PortableContact;
@ -15,7 +16,6 @@ use Friendica\Protocol\Salmon;
use dba;
require_once 'include/dba.php';
require_once 'include/queue_fn.php';
require_once 'include/datetime.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
@ -75,7 +75,7 @@ class Queue
$contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
if (!DBM::is_result($contact)) {
remove_queue_item($q_item['id']);
Queue::removeItem($q_item['id']);
return;
}
@ -83,7 +83,7 @@ class Queue
if (!is_null($dead) && $dead) {
logger('queue: skipping known dead url: ' . $contact['notify']);
update_queue_time($q_item['id']);
Queue::updateTime($q_item['id']);
return;
}
@ -101,14 +101,14 @@ class Queue
if (!is_null($vital) && !$vital) {
logger('queue: skipping dead server: ' . $server);
update_queue_time($q_item['id']);
Queue::updateTime($q_item['id']);
return;
}
}
$user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
if (!DBM::is_result($user)) {
remove_queue_item($q_item['id']);
Queue::removeItem($q_item['id']);
return;
}
@ -124,10 +124,10 @@ class Queue
$deliver_status = DFRN::deliver($owner, $contact, $data);
if ($deliver_status == (-1)) {
update_queue_time($q_item['id']);
Queue::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else {
remove_queue_item($q_item['id']);
Queue::removeItem($q_item['id']);
}
break;
case NETWORK_OSTATUS:
@ -136,10 +136,10 @@ class Queue
$deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
if ($deliver_status == (-1)) {
update_queue_time($q_item['id']);
Queue::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else {
remove_queue_item($q_item['id']);
Queue::removeItem($q_item['id']);
}
}
break;
@ -149,10 +149,10 @@ class Queue
$deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true);
if ($deliver_status == (-1)) {
update_queue_time($q_item['id']);
Queue::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else {
remove_queue_item($q_item['id']);
Queue::removeItem($q_item['id']);
}
}
break;
@ -162,9 +162,9 @@ class Queue
call_hooks('queue_deliver', $params);
if ($params['result']) {
remove_queue_item($q_item['id']);
Queue::removeItem($q_item['id']);
} else {
update_queue_time($q_item['id']);
Queue::updateTime($q_item['id']);
}
break;
}