keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt loglevels to reduce log-noise

This commit is contained in:
Philipp 2023-03-19 19:33:03 +01:00
parent c95e961683
commit 88e339a43d
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Item.php
View File

@ -1270,7 +1270,7 @@ class Item
Post\ThreadUser::insert($item['uri-id'], $item['uid'], $item); Post\ThreadUser::insert($item['uri-id'], $item['uid'], $item);
} }
Logger::notice('created item', ['post-id' => $post_user_id, 'uid' => $item['uid'], 'network' => $item['network'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); Logger::info('created item', ['post-id' => $post_user_id, 'uid' => $item['uid'], 'network' => $item['network'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
$posted_item = Post::selectFirst(self::ITEM_FIELDLIST, ['post-user-id' => $post_user_id]); $posted_item = Post::selectFirst(self::ITEM_FIELDLIST, ['post-user-id' => $post_user_id]);
if (!DBA::isResult($posted_item)) { if (!DBA::isResult($posted_item)) {

22
src/Protocol/DFRN.php
View File

@ -1342,7 +1342,7 @@ class DFRN
*/ */
private static function processMail(DOMXPath $xpath, DOMNode $mail, array $importer) private static function processMail(DOMXPath $xpath, DOMNode $mail, array $importer)
{ {
Logger::notice("Processing mails"); Logger::info("Processing mails");
$msg = []; $msg = [];
$msg['uid'] = $importer['importer_uid']; $msg['uid'] = $importer['importer_uid'];
@ -1370,7 +1370,7 @@ class DFRN
*/ */
private static function processSuggestion(DOMXPath $xpath, DOMNode $suggestion, array $importer) 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); $url = $xpath->evaluate('string(dfrn:url[1]/text())', $suggestion);
$cid = Contact::getIdForURL($url); $cid = Contact::getIdForURL($url);
@ -1446,7 +1446,7 @@ class DFRN
*/ */
private static function processRelocation(DOMXPath $xpath, DOMNode $relocation, array $importer): bool 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 /// @TODO Rewrite this to one statement
$relocate = []; $relocate = [];
@ -1499,7 +1499,7 @@ class DFRN
Contact::updateAvatar($importer['id'], $relocate['avatar'], true); Contact::updateAvatar($importer['id'], $relocate['avatar'], true);
Logger::notice('Contacts are updated.'); Logger::info('Contacts are updated.');
/// @TODO /// @TODO
/// merge with current record, current contents have priority /// 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. // Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus. // This function once was responsible for DFRN and OStatus.
if ($activity->match($item['verb'], Activity::FOLLOW)) { if ($activity->match($item['verb'], Activity::FOLLOW)) {
Logger::notice("New follower"); Logger::info("New follower");
Contact::addRelationship($importer, $contact, $item); Contact::addRelationship($importer, $contact, $item);
return false; return false;
} }
if ($activity->match($item['verb'], Activity::UNFOLLOW)) { if ($activity->match($item['verb'], Activity::UNFOLLOW)) {
Logger::notice("Lost follower"); Logger::info("Lost follower");
Contact::removeFollower($contact); Contact::removeFollower($contact);
return false; return false;
} }
if ($activity->match($item['verb'], Activity::REQ_FRIEND)) { if ($activity->match($item['verb'], Activity::REQ_FRIEND)) {
Logger::notice("New friend request"); Logger::info("New friend request");
Contact::addRelationship($importer, $contact, $item, true); Contact::addRelationship($importer, $contact, $item, true);
return false; return false;
} }
if ($activity->match($item['verb'], Activity::UNFRIEND)) { if ($activity->match($item['verb'], Activity::UNFRIEND)) {
Logger::notice("Lost sharer"); Logger::info("Lost sharer");
Contact::removeSharer($contact); Contact::removeSharer($contact);
return false; return false;
} }
@ -1759,7 +1759,7 @@ class DFRN
*/ */
private static function processEntry(array $header, DOMXPath $xpath, DOMNode $entry, array $importer, string $xml, int $protocol) 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; $item = $header;
@ -2107,7 +2107,7 @@ class DFRN
*/ */
private static function processDeletion(DOMXPath $xpath, DOMNode $deletion, array $importer) private static function processDeletion(DOMXPath $xpath, DOMNode $deletion, array $importer)
{ {
Logger::notice("Processing deletions"); Logger::info("Processing deletions");
$uri = null; $uri = null;
foreach ($deletion->attributes as $attributes) { foreach ($deletion->attributes as $attributes) {
@ -2287,7 +2287,7 @@ class DFRN
self::processDeletion($xpath, $deletion, $importer); self::processDeletion($xpath, $deletion, $importer);
} }
if (count($deletions) > 0) { if (count($deletions) > 0) {
Logger::notice(count($deletions) . ' deletions had been processed'); Logger::info(count($deletions) . ' deletions had been processed');
return 200; 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 // 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) // (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 // 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); $key = self::key($author);
if (!$key) { if (!$key) {
Logger::notice('Could not retrieve author key.'); Logger::notice('Could not retrieve author key.');
@ -477,7 +477,7 @@ class Diaspora
throw new \Friendica\Network\HTTPException\BadRequestException(); throw new \Friendica\Network\HTTPException\BadRequestException();
} }
Logger::notice('Message verified.'); Logger::info('Message verified.');
return [ return [
'message' => $inner_decrypted, 'message' => $inner_decrypted,
@ -1154,7 +1154,7 @@ class Diaspora
{ {
// Check for Diaspora (and Friendica) typical paths // 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)) { 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; return false;
} }
@ -1175,7 +1175,7 @@ class Diaspora
Logger::info('Found', ['id' => $item['id']]); Logger::info('Found', ['id' => $item['id']]);
return $item['id']; return $item['id'];
} else { } else {
Logger::info('Not found', ['guid' => $guid, 'uid' => $uid]); Logger::notice('Not found', ['guid' => $guid, 'uid' => $uid]);
return false; return false;
} }
} }
@ -1225,7 +1225,7 @@ class Diaspora
Logger::notice('Parent item not found: parent: ' . $guid . ' - user: ' . $uid); Logger::notice('Parent item not found: parent: ' . $guid . ' - user: ' . $uid);
return false; return false;
} else { } else {
Logger::notice('Parent item found: parent: ' . $guid . ' - user: ' . $uid); Logger::info('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
return $item; return $item;
} }
} }
@ -1365,7 +1365,7 @@ class Diaspora
return false; 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 // Check signature
$signed_text = 'AccountMigration:' . $old_author . ':' . $new_author; $signed_text = 'AccountMigration:' . $old_author . ':' . $new_author;
@ -1399,7 +1399,7 @@ class Diaspora
Contact::update($fields, ['addr' => $old_author->getAddr()]); Contact::update($fields, ['addr' => $old_author->getAddr()]);
Logger::notice('Contacts are updated.'); Logger::info('Contacts are updated.');
return true; return true;
} }
@ -1422,7 +1422,7 @@ class Diaspora
} }
DBA::close($contacts); DBA::close($contacts);
Logger::notice('Removed contacts for ' . $author_handle); Logger::info('Removed contacts for ' . $author_handle);
return true; return true;
} }
@ -2955,7 +2955,7 @@ class Diaspora
return 0; return 0;
} }
Logger::notice('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url); Logger::info('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
if (!intval(DI::config()->get('system', 'diaspora_test'))) { if (!intval(DI::config()->get('system', 'diaspora_test'))) {
$content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json'); $content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json');
@ -2973,7 +2973,7 @@ class Diaspora
GServer::setReachableById($contact['gsid'], Protocol::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; return $return_code ? $return_code : -1;
} }