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

Merge pull request #12916 from nupplaphil/feat/reduce_logging_noise

Browse source 
Adapt loglevels to reduce log-noise
This commit is contained in:
Michael Vogel 2023-03-20 08:52:16 +01:00 committed by GitHub
commit d3e085bd5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Protocol/DFRN.php
View file

@ -1342,7 +1342,7 @@ class DFRN
*/
private static function processMail(DOMXPath $xpath, DOMNode $mail, array $importer)
{
Logger::notice("Processing mails");
Logger::info("Processing mails");
$msg = [];
$msg['uid'] = $importer['importer_uid'];
@ -1370,7 +1370,7 @@ class DFRN
*/
private static function processSuggestion(DOMXPath $xpath, DOMNode $suggestion, array $importer)
{
Logger::notice('Processing suggestions');
Logger::info('Processing suggestions');
$url = $xpath->evaluate('string(dfrn:url[1]/text())', $suggestion);
$cid = Contact::getIdForURL($url);
@ -1446,7 +1446,7 @@ class DFRN
*/
private static function processRelocation(DOMXPath $xpath, DOMNode $relocation, array $importer): bool
{
Logger::notice("Processing relocations");
Logger::info("Processing relocations");
/// @TODO Rewrite this to one statement
$relocate = [];
@ -1499,7 +1499,7 @@ class DFRN
Contact::updateAvatar($importer['id'], $relocate['avatar'], true);
Logger::notice('Contacts are updated.');
Logger::info('Contacts are updated.');
/// @TODO
/// merge with current record, current contents have priority
@ -1594,22 +1594,22 @@ class DFRN
// Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus.
if ($activity->match($item['verb'], Activity::FOLLOW)) {
Logger::notice("New follower");
Logger::info("New follower");
Contact::addRelationship($importer, $contact, $item);
return false;
}
if ($activity->match($item['verb'], Activity::UNFOLLOW)) {
Logger::notice("Lost follower");
Logger::info("Lost follower");
Contact::removeFollower($contact);
return false;
}
if ($activity->match($item['verb'], Activity::REQ_FRIEND)) {
Logger::notice("New friend request");
Logger::info("New friend request");
Contact::addRelationship($importer, $contact, $item, true);
return false;
}
if ($activity->match($item['verb'], Activity::UNFRIEND)) {
Logger::notice("Lost sharer");
Logger::info("Lost sharer");
Contact::removeSharer($contact);
return false;
}
@ -1759,7 +1759,7 @@ class DFRN
*/
private static function processEntry(array $header, DOMXPath $xpath, DOMNode $entry, array $importer, string $xml, int $protocol)
{
Logger::notice("Processing entries");
Logger::info("Processing entries");
$item = $header;
@ -2107,7 +2107,7 @@ class DFRN
*/
private static function processDeletion(DOMXPath $xpath, DOMNode $deletion, array $importer)
{
Logger::notice("Processing deletions");
Logger::info("Processing deletions");
$uri = null;
foreach ($deletion->attributes as $attributes) {
@ -2287,7 +2287,7 @@ class DFRN
self::processDeletion($xpath, $deletion, $importer);
}
if (count($deletions) > 0) {
Logger::notice(count($deletions) . ' deletions had been processed');
Logger::info(count($deletions) . ' deletions had been processed');
return 200;
}
}

20
src/Protocol/Diaspora.php
View file

@ -463,7 +463,7 @@ class Diaspora
// Once we have the author URI, go to the web and try to find their public key
// (first this will look it up locally if it is in the diaspora-contact cache)
// This will also convert diaspora public key from pkcs#1 to pkcs#8
Logger::notice('Fetching key for ' . $author);
Logger::info('Fetching key for ' . $author);
$key = self::key($author);
if (!$key) {
Logger::notice('Could not retrieve author key.');
@ -477,7 +477,7 @@ class Diaspora
throw new \Friendica\Network\HTTPException\BadRequestException();
}
Logger::notice('Message verified.');
Logger::info('Message verified.');
return [
'message' => $inner_decrypted,
@ -1154,7 +1154,7 @@ class Diaspora
{
// Check for Diaspora (and Friendica) typical paths
if (!preg_match('=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i', $url, $matches)) {
Logger::info('Invalid url', ['url' => $url]);
Logger::notice('Invalid url', ['url' => $url]);
return false;
}
@ -1175,7 +1175,7 @@ class Diaspora
Logger::info('Found', ['id' => $item['id']]);
return $item['id'];
} else {
Logger::info('Not found', ['guid' => $guid, 'uid' => $uid]);
Logger::notice('Not found', ['guid' => $guid, 'uid' => $uid]);
return false;
}
}
@ -1225,7 +1225,7 @@ class Diaspora
Logger::notice('Parent item not found: parent: ' . $guid . ' - user: ' . $uid);
return false;
} else {
Logger::notice('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
Logger::info('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
return $item;
}
}
@ -1365,7 +1365,7 @@ class Diaspora
return false;
}
Logger::notice('Got migration for ' . $old_author . ', to ' . $new_author . ' with user ' . $importer['uid']);
Logger::info('Got migration for ' . $old_author . ', to ' . $new_author . ' with user ' . $importer['uid']);
// Check signature
$signed_text = 'AccountMigration:' . $old_author . ':' . $new_author;
@ -1399,7 +1399,7 @@ class Diaspora
Contact::update($fields, ['addr' => $old_author->getAddr()]);
Logger::notice('Contacts are updated.');
Logger::info('Contacts are updated.');
return true;
}
@ -1422,7 +1422,7 @@ class Diaspora
}
DBA::close($contacts);
Logger::notice('Removed contacts for ' . $author_handle);
Logger::info('Removed contacts for ' . $author_handle);
return true;
}
@ -2955,7 +2955,7 @@ class Diaspora
return 0;
}
Logger::notice('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
Logger::info('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
if (!intval(DI::config()->get('system', 'diaspora_test'))) {
$content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json');
@ -2973,7 +2973,7 @@ class Diaspora
GServer::setReachableById($contact['gsid'], Protocol::DIASPORA);
}
Logger::notice('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
Logger::info('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
return $return_code ? $return_code : -1;
}