EntropyEngineer/friendica-addons
0
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #839 from annando/replace-queue

Browse source 
Replace the "Queue" mechanism with deferred workers
This commit is contained in:
Hypolite Petovan 2019-04-04 10:46:04 -04:00 committed by GitHub
commit 5d0760f285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
diaspora/diaspora.php
View file

@ -18,6 +18,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Queue; use Friendica\Model\Queue;
use Friendica\Core\Worker;
function diaspora_install() function diaspora_install()
{ {
@ -396,14 +397,7 @@ function diaspora_send(App $a, array &$b)
Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG); Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG);
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); Worker::defer();
if (count($r))
$a->contact = $r[0]["id"];
$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]);
Queue::add($a->contact, Protocol::DIASPORA2, $s);
notice(L10n::t('Diaspora post failed. Queued for retry.').EOL);
} }
} }
} }

22
pumpio/pumpio.php
View file

@ -609,16 +609,7 @@ function pumpio_send(App $a, array &$b)
} }
} else { } else {
Logger::log('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true)); Logger::log('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
Worker::defer();
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
if (DBA::isResult($r)) {
$a->contact = $r[0]["id"];
}
$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]);
Queue::add($a->contact, Protocol::PUMPIO, $s);
notice(L10n::t('Pump.io post failed. Queued for retry.').EOL);
} }
} }
} }
@ -686,16 +677,7 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "")
Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri); Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri);
} else { } else {
Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true)); Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true));
Worker::defer();
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $uid);
if (DBA::isResult($r)) {
$a->contact = $r[0]["id"];
}
$s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]);
Queue::add($a->contact, Protocol::PUMPIO, $s);
notice(L10n::t('Pump.io like failed. Queued for retry.').EOL);
} }
} }

11
twitter/twitter.php
View file

@ -684,16 +684,7 @@ function twitter_post_hook(App $a, array &$b)
if (!empty($result->errors)) { if (!empty($result->errors)) {
Logger::log('Send to Twitter failed: "' . print_r($result->errors, true) . '"'); Logger::log('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
Worker::defer();
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
if (DBA::isResult($r)) {
$a->contact = $r[0]["id"];
}
$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]);
Queue::add($a->contact, Protocol::TWITTER, $s);
notice(L10n::t('Twitter post failed. Queued for retry.') . EOL);
} elseif ($iscomment) { } elseif ($iscomment) {
Logger::log('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); Logger::log('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]); Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);