strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Issue 10651: Improved logging

Browse source
This commit is contained in:
Michael 2021-09-04 04:51:20 +00:00
parent 14050ea67b
commit d89f004a2a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Worker/Delivery.php
View file

@ -32,7 +32,6 @@ use Friendica\Protocol\Email;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Model\Conversation;
use Friendica\Model\FContact; use Friendica\Model\FContact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Protocol\Relay; use Friendica\Protocol\Relay;
@ -210,7 +209,8 @@ class Delivery
// Also transmit via Diaspora if this is a direct answer to a Diaspora comment. // Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
// This is done since the uri wouldn't match (Diaspora doesn't transmit it) // This is done since the uri wouldn't match (Diaspora doesn't transmit it)
// Also transmit relayed posts from Diaspora contacts via Diaspora. // Also transmit relayed posts from Diaspora contacts via Diaspora.
if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network'], $target_item['network']])) { if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']])) {
Logger::info('Enforcing the Diaspora protocol', ['id' => $contact['id'], 'network' => $contact['network'], 'parent' => $parent['network'], 'thread-parent' => $thr_parent['network'], 'post' => $target_item['network']]);
$contact['network'] = Protocol::DIASPORA; $contact['network'] = Protocol::DIASPORA;
} }

6
src/Worker/Notifier.php
View file

@ -179,7 +179,7 @@ class Notifier
$thr_parent = $parent; $thr_parent = $parent;
} }
Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG); Logger::info('Got post', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'network' => $target_item['network'], 'parent-network' => $parent['network'], 'thread-parent-network' => $thr_parent['network']]);
if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) { if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) {
$apdelivery = self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->getQueueValue('priority'), $a->getQueueValue('created'), $owner); $apdelivery = self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->getQueueValue('priority'), $a->getQueueValue('created'), $owner);
@ -732,21 +732,25 @@ class Notifier
{ {
// Don't deliver via AP when the starting post isn't from a federated network // Don't deliver via AP when the starting post isn't from a federated network
if (!in_array($parent['network'], Protocol::FEDERATED)) { if (!in_array($parent['network'], Protocol::FEDERATED)) {
Logger::info('Parent network is no federated network, so no AP delivery', ['network' => $parent['network']]);
return ['count' => 0, 'contacts' => []]; return ['count' => 0, 'contacts' => []];
} }
// Don't deliver via AP when the starting post is delivered via Diaspora // Don't deliver via AP when the starting post is delivered via Diaspora
if ($parent['network'] == Protocol::DIASPORA) { if ($parent['network'] == Protocol::DIASPORA) {
Logger::info('Parent network is Diaspora, so no AP delivery');
return ['count' => 0, 'contacts' => []]; return ['count' => 0, 'contacts' => []];
} }
// Also don't deliver when the direct thread parent was delivered via Diaspora // Also don't deliver when the direct thread parent was delivered via Diaspora
if ($thr_parent['network'] == Protocol::DIASPORA) { if ($thr_parent['network'] == Protocol::DIASPORA) {
Logger::info('Threat parent network is Diaspora, so no AP delivery');
return ['count' => 0, 'contacts' => []]; return ['count' => 0, 'contacts' => []];
} }
// Posts from Diaspora contacts are transmitted via Diaspora // Posts from Diaspora contacts are transmitted via Diaspora
if ($target_item['network'] == Protocol::DIASPORA) { if ($target_item['network'] == Protocol::DIASPORA) {
Logger::info('Post network is Diaspora, so no AP delivery');
return ['count' => 0, 'contacts' => []]; return ['count' => 0, 'contacts' => []];
} }