From e4a37f344ef52195f7ad9e7988d8a495b4034069 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 18 Oct 2023 19:55:15 +0000 Subject: [PATCH] Individual callstacks are removed from the logger --- src/BaseModule.php | 5 ++--- src/Content/Text/Markdown.php | 3 +-- src/Content/Widget/VCard.php | 3 +-- src/Core/Logger/Util/Introspection.php | 2 +- src/Core/System.php | 6 +++--- src/Core/Worker.php | 2 +- src/Database/Database.php | 6 ++---- src/Model/APContact.php | 2 +- src/Model/Contact.php | 14 +++++++------- src/Model/Contact/User.php | 3 +-- src/Model/GServer.php | 5 ++--- src/Model/Item.php | 8 ++++---- src/Model/Photo.php | 2 +- src/Model/Post.php | 3 +-- src/Model/Post/Link.php | 3 +-- src/Model/Post/Media.php | 9 ++++----- src/Model/Profile.php | 4 ++-- src/Model/Tag.php | 10 +++++----- src/Model/User.php | 4 ++-- src/Module/Contact.php | 3 +-- src/Module/Special/HTTPException.php | 1 - src/Navigation/Notifications/Repository/Notify.php | 2 +- src/Network/Factory/MimeType.php | 3 +-- src/Network/HTTPClient/Client/HttpClient.php | 10 +++++----- src/Network/Probe.php | 3 +-- src/Protocol/ActivityPub/Processor.php | 3 +-- src/Protocol/ActivityPub/Queue.php | 3 +-- src/Protocol/ActivityPub/Receiver.php | 6 +++--- src/Protocol/ActivityPub/Transmitter.php | 2 +- src/Protocol/Diaspora.php | 4 ++-- .../Diaspora/Repository/DiasporaContact.php | 3 +-- src/Util/Crypto.php | 5 ++--- src/Util/JsonLD.php | 2 +- src/Util/Proxy.php | 2 +- src/Util/Strings.php | 3 +-- src/Util/XML.php | 3 +-- 36 files changed, 66 insertions(+), 86 deletions(-) diff --git a/src/BaseModule.php b/src/BaseModule.php index dc7aaedd90..c04b835c52 100644 --- a/src/BaseModule.php +++ b/src/BaseModule.php @@ -33,7 +33,6 @@ use Friendica\Module\Response; use Friendica\Module\Special\HTTPException as ModuleHTTPException; use Friendica\Network\HTTPException; use Friendica\Util\Profiler; -use Friendica\Util\XML; use Psr\Http\Message\ResponseInterface; use Psr\Log\LoggerInterface; @@ -494,7 +493,7 @@ abstract class BaseModule implements ICanHandleRequests public function httpError(int $httpCode, string $message = '', $content = '') { if ($httpCode >= 400) { - $this->logger->debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']); + $this->logger->debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']); } $this->response->setStatus($httpCode, $message); @@ -529,7 +528,7 @@ abstract class BaseModule implements ICanHandleRequests public function jsonError(int $httpCode, $content, string $content_type = 'application/json') { if ($httpCode >= 400) { - $this->logger->debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']); + $this->logger->debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']); } $this->response->setStatus($httpCode); diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php index 33e023bc03..597a28221f 100644 --- a/src/Content/Text/Markdown.php +++ b/src/Content/Text/Markdown.php @@ -22,7 +22,6 @@ namespace Friendica\Content\Text; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\DI; use Friendica\Model\Contact; @@ -112,7 +111,7 @@ class Markdown { // @TODO Temporary until we find the source of the null value to finally set the correct type-hint if (is_null($s)) { - Logger::warning('Received null value', ['callstack' => System::callstack()]); + Logger::warning('Received null value'); return ''; } diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index 1d5cde87b4..b568447e61 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -26,7 +26,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Util\Network; @@ -48,7 +47,7 @@ class VCard public static function getHTML(array $contact): string { if (!isset($contact['network']) || !isset($contact['id'])) { - Logger::warning('Incomplete contact', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]); + Logger::warning('Incomplete contact', ['contact' => $contact ?? []]); } if (!Network::isValidHttpUrl($contact['url']) && Network::isValidHttpUrl($contact['alias'])) { diff --git a/src/Core/Logger/Util/Introspection.php b/src/Core/Logger/Util/Introspection.php index 3b7d807f52..0698536e15 100644 --- a/src/Core/Logger/Util/Introspection.php +++ b/src/Core/Logger/Util/Introspection.php @@ -87,7 +87,7 @@ class Introspection implements IHaveCallIntrospections 'line' => $trace[$i - 1]['line'] ?? null, 'function' => $trace[$i]['function'] ?? null, 'request-id' => $this->requestId, - 'stack' => System::callstack(10, 0, true, ['Friendica\Core\Logger\Type\StreamLogger', 'Friendica\Core\Logger\Type\AbstractLogger', 'Friendica\Core\Logger\Type\WorkerLogger', 'Friendica\Core\Logger']), + 'stack' => System::callstack(15, 0, true, ['Friendica\Core\Logger\Type\StreamLogger', 'Friendica\Core\Logger\Type\AbstractLogger', 'Friendica\Core\Logger\Type\WorkerLogger', 'Friendica\Core\Logger']), ]; } diff --git a/src/Core/System.php b/src/Core/System.php index a51ffe0d1f..9e820dde5f 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -220,7 +220,7 @@ class System proc_close($resource); - $this->logger->info('Executed "proc_open"', ['command' => $cmdline, 'callstack' => System::callstack(10)]); + $this->logger->info('Executed "proc_open"', ['command' => $cmdline]); } /** @@ -348,7 +348,7 @@ class System public static function httpError($httpCode, $message = '', $content = '') { if ($httpCode >= 400) { - Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); + Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); } DI::apiResponse()->setStatus($httpCode, $message); @@ -381,7 +381,7 @@ class System public static function jsonError($httpCode, $content, $content_type = 'application/json') { if ($httpCode >= 400) { - Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); + Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); } DI::apiResponse()->setStatus($httpCode); self::jsonExit($content, $content_type); diff --git a/src/Core/Worker.php b/src/Core/Worker.php index c84b59e2b7..0c6b67f855 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -1276,7 +1276,7 @@ class Worker $added = 0; if (!is_int($priority) || !in_array($priority, self::PRIORITIES)) { - Logger::warning('Invalid priority', ['priority' => $priority, 'command' => $command, 'callstack' => System::callstack(20)]); + Logger::warning('Invalid priority', ['priority' => $priority, 'command' => $command]); $priority = self::PRIORITY_MEDIUM; } diff --git a/src/Database/Database.php b/src/Database/Database.php index 9366f1b314..946c82f5c5 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -528,7 +528,7 @@ class Database if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) { // Question: Should we continue or stop the query here? - $this->logger->warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args, 'callstack' => System::callstack()]); + $this->logger->warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args]); } $sql = DBA::cleanQuery($sql); @@ -702,7 +702,6 @@ class Database $this->logger->error('DB Error', [ 'code' => $errorno, 'error' => $error, - 'callstack' => System::callstack(8), 'params' => $this->replaceParameters($sql, $args), ]); @@ -810,7 +809,6 @@ class Database $this->logger->error('DB Error', [ 'code' => $errorno, 'error' => $error, - 'callstack' => System::callstack(8), 'params' => $this->replaceParameters($sql, $params), ]); @@ -1292,7 +1290,7 @@ class Database $condition_string = DBA::buildCondition($conditions); $sql = "DELETE FROM " . $table_string . " " . $condition_string; - $this->logger->debug($this->replaceParameters($sql, $conditions), ['callstack' => System::callstack(6)]); + $this->logger->debug($this->replaceParameters($sql, $conditions)); return $this->e($sql, $conditions); } diff --git a/src/Model/APContact.php b/src/Model/APContact.php index 5434bf584f..ff151e469e 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -176,7 +176,7 @@ class APContact $cachekey = 'apcontact:' . ItemURI::getIdByURI($url); $result = DI::cache()->get($cachekey); if (!is_null($result)) { - Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]); + Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'result' => $result]); if (!empty($fetched_contact)) { return $fetched_contact; } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index be3cec4701..d2e04c998e 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1081,7 +1081,7 @@ class Contact return; } } elseif (!isset($contact['url'])) { - Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]); + Logger::info('Empty contact', ['contact' => $contact]); } Logger::info('Contact is marked for archival', ['id' => $contact['id'], 'term-date' => $contact['term-date']]); @@ -1366,7 +1366,7 @@ class Contact } if (DBA::isResult($personal_contact)) { - Logger::info('Take contact data from personal contact', ['url' => $url, 'update' => $update, 'contact' => $personal_contact, 'callstack' => System::callstack(20)]); + Logger::info('Take contact data from personal contact', ['url' => $url, 'update' => $update, 'contact' => $personal_contact]); $data = $personal_contact; $data['photo'] = $personal_contact['avatar']; $data['account-type'] = $personal_contact['contact-type']; @@ -1378,7 +1378,7 @@ class Contact } if (empty($data['network']) || ($data['network'] == Protocol::PHANTOM)) { - Logger::notice('No valid network found', ['url' => $url, 'uid' => $uid, 'default' => $default, 'update' => $update, 'callstack' => System::callstack(20)]); + Logger::notice('No valid network found', ['url' => $url, 'uid' => $uid, 'default' => $default, 'update' => $update]); return 0; } @@ -2576,7 +2576,7 @@ class Contact Worker::add(Worker::PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid); } DBA::close($duplicates); - Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl, 'callstack' => System::callstack(20)]); + Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]); return true; } @@ -2599,7 +2599,7 @@ class Contact $stamp = (float)microtime(true); self::updateFromProbe($id); - Logger::debug('Contact data is updated.', ['duration' => round((float)microtime(true) - $stamp, 3), 'id' => $id, 'url' => $contact['url'], 'callstack' => System::callstack(20)]); + Logger::debug('Contact data is updated.', ['duration' => round((float)microtime(true) - $stamp, 3), 'id' => $id, 'url' => $contact['url']]); return true; } @@ -2839,7 +2839,7 @@ class Contact } $ret['last-item'] = Probe::getLastUpdate($ret); - Logger::info('Fetched last item', ['id' => $id, 'probed_url' => $ret['url'], 'last-item' => $ret['last-item'], 'callstack' => System::callstack(20)]); + Logger::info('Fetched last item', ['id' => $id, 'probed_url' => $ret['url'], 'last-item' => $ret['last-item']]); } $update = false; @@ -3370,7 +3370,7 @@ class Contact } elseif (!empty($contact['id'])) { self::remove($contact['id']); } else { - DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact, 'callstack' => System::callstack()]); + DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact]); return; } diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php index 651c4d005a..c86b1c6bea 100644 --- a/src/Model/Contact/User.php +++ b/src/Model/Contact/User.php @@ -24,7 +24,6 @@ namespace Friendica\Model\Contact; use Exception; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; @@ -55,7 +54,7 @@ class User } if (empty($contact['uri-id']) && empty($contact['url'])) { - Logger::info('Missing contact details', ['contact' => $contact, 'callstack' => System::callstack(20)]); + Logger::info('Missing contact details', ['contact' => $contact]); return false; } diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 758ff0f135..4378814854 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -26,7 +26,6 @@ use DOMXPath; use Exception; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\Database; use Friendica\Database\DBA; @@ -126,7 +125,7 @@ class GServer $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]); if (DBA::isResult($gserver)) { - Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url, 'callstack' => System::callstack(20)]); + Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url]); if (Network::isUrlBlocked($url)) { self::setBlockedById($gserver['id']); @@ -2515,7 +2514,7 @@ class GServer } } - Logger::info('Protocol for server', ['protocol' => $protocol, 'old' => $old, 'id' => $gsid, 'url' => $gserver['url'], 'callstack' => System::callstack(20)]); + Logger::info('Protocol for server', ['protocol' => $protocol, 'old' => $old, 'id' => $gsid, 'url' => $gserver['url']]); self::update(['protocol' => $protocol], ['id' => $gsid]); } diff --git a/src/Model/Item.php b/src/Model/Item.php index 5f83ae38da..04853314f5 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -330,7 +330,7 @@ class Item */ public static function markForDeletionById(int $item_id, int $priority = Worker::PRIORITY_HIGH): bool { - Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]); + Logger::info('Mark item for deletion by id', ['id' => $item_id]); // locate item to be deleted $fields = [ 'id', 'uri', 'uri-id', 'uid', 'parent', 'parent-uri-id', 'origin', @@ -795,7 +795,7 @@ class Item } if (!DBA::isResult($parent)) { - Logger::notice('item parent was not found - ignoring item', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'callstack' => System::callstack(20)]); + Logger::notice('item parent was not found - ignoring item', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]); return []; } @@ -1183,7 +1183,7 @@ class Item if (!empty($quote_id)) { // This is one of these "should not happen" situations. // The protocol implementations should already have done this job. - Logger::notice('Quote-uri-id detected in post', ['id' => $quote_id, 'guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'callstack' => System::callstack(20)]); + Logger::notice('Quote-uri-id detected in post', ['id' => $quote_id, 'guid' => $item['guid'], 'uri-id' => $item['uri-id']]); $item['quote-uri-id'] = $quote_id; } } @@ -2162,7 +2162,7 @@ class Item $hostPart = $host ?: $parsed['host'] ?? ''; if (!$hostPart) { - Logger::warning('Empty host GUID part', ['uri' => $uri, 'host' => $host, 'parsed' => $parsed, 'callstack' => System::callstack(10)]); + Logger::warning('Empty host GUID part', ['uri' => $uri, 'host' => $host, 'parsed' => $parsed]); } // Glue it together to be able to make a hash from it diff --git a/src/Model/Photo.php b/src/Model/Photo.php index cae035f36e..92b65957a6 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -589,7 +589,7 @@ class Photo $photo_failure = false; if (!Network::isValidHttpUrl($image_url)) { - Logger::warning('Invalid image url', ['image_url' => $image_url, 'uid' => $uid, 'cid' => $cid, 'callstack' => System::callstack(20)]); + Logger::warning('Invalid image url', ['image_url' => $image_url, 'uid' => $uid, 'cid' => $cid]); return false; } diff --git a/src/Model/Post.php b/src/Model/Post.php index 323b307fcd..2e8bbe22e3 100644 --- a/src/Model/Post.php +++ b/src/Model/Post.php @@ -23,7 +23,6 @@ namespace Friendica\Model; use BadMethodCallException; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; @@ -611,7 +610,7 @@ class Post { $affected = 0; - Logger::info('Start Update', ['fields' => $fields, 'condition' => $condition, 'uid' => DI::userSession()->getLocalUserId(),'callstack' => System::callstack(10)]); + Logger::info('Start Update', ['fields' => $fields, 'condition' => $condition, 'uid' => DI::userSession()->getLocalUserId()]); // Don't allow changes to fields that are responsible for the relation between the records unset($fields['id']); diff --git a/src/Model/Post/Link.php b/src/Model/Post/Link.php index 3fafdd7eaf..87bc457524 100644 --- a/src/Model/Post/Link.php +++ b/src/Model/Post/Link.php @@ -22,7 +22,6 @@ namespace Friendica\Model\Post; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; @@ -67,7 +66,7 @@ class Link } if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https'])) { - Logger::info('Bad URL, quitting', ['uri-id' => $uriId, 'url' => $url, 'callstack' => System::callstack(20)]); + Logger::info('Bad URL, quitting', ['uri-id' => $uriId, 'url' => $url]); return $url; } diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 538c75091f..4ba67de9a8 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -25,7 +25,6 @@ use Friendica\Content\PageInfo; use Friendica\Content\Text\BBCode; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; @@ -79,7 +78,7 @@ class Media } if (DBA::exists('post-media', ['uri-id' => $media['uri-id'], 'preview' => $media['url']])) { - Logger::info('Media already exists as preview', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'callstack' => System::callstack()]); + Logger::info('Media already exists as preview', ['uri-id' => $media['uri-id'], 'url' => $media['url']]); return false; } @@ -87,12 +86,12 @@ class Media // and embedded as picture then we only store the picture or replace the document $found = DBA::selectFirst('post-media', ['type'], ['uri-id' => $media['uri-id'], 'url' => $media['url']]); if (!$force && !empty($found) && (($found['type'] != self::DOCUMENT) || ($media['type'] == self::DOCUMENT))) { - Logger::info('Media already exists', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'callstack' => System::callstack()]); + Logger::info('Media already exists', ['uri-id' => $media['uri-id'], 'url' => $media['url']]); return false; } if (!ItemURI::exists($media['uri-id'])) { - Logger::info('Media referenced URI ID not found', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'callstack' => System::callstack()]); + Logger::info('Media referenced URI ID not found', ['uri-id' => $media['uri-id'], 'url' => $media['url']]); return false; } @@ -102,7 +101,7 @@ class Media // We are storing as fast as possible to avoid duplicated network requests // when fetching additional information for pictures and other content. $result = DBA::insert('post-media', $media, Database::INSERT_UPDATE); - Logger::info('Stored media', ['result' => $result, 'media' => $media, 'callstack' => System::callstack()]); + Logger::info('Stored media', ['result' => $result, 'media' => $media]); $stored = $media; $media = self::fetchAdditionalData($media); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index c2b21e904b..373acbc173 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -228,7 +228,7 @@ class Profile // System user, aborting if ($profile['uid'] === 0) { - DI::logger()->warning('System user found in Profile::load', ['nickname' => $nickname, 'callstack' => System::callstack(20)]); + DI::logger()->warning('System user found in Profile::load', ['nickname' => $nickname]); throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } @@ -450,7 +450,7 @@ class Profile $p['url'] = Contact::magicLinkById($cid, $profile['url']); if (!isset($profile['hidewall'])) { - Logger::warning('Missing hidewall key in profile array', ['profile' => $profile, 'callstack' => System::callstack(10)]); + Logger::warning('Missing hidewall key in profile array', ['profile' => $profile]); } if ($profile['account-type'] == Contact::TYPE_COMMUNITY) { diff --git a/src/Model/Tag.php b/src/Model/Tag.php index 04f3f1627e..3758e065d3 100644 --- a/src/Model/Tag.php +++ b/src/Model/Tag.php @@ -112,7 +112,7 @@ class Tag } if ((substr($url, 0, 7) == 'https//') || (substr($url, 0, 6) == 'http//')) { - Logger::notice('Wrong scheme in url', ['url' => $url, 'callstack' => System::callstack(20)]); + Logger::notice('Wrong scheme in url', ['url' => $url]); } $cid = Contact::getIdForURL($url, 0, false); @@ -159,7 +159,7 @@ class Tag DBA::insert('post-tag', $fields, Database::INSERT_IGNORE); - Logger::debug('Stored tag/mention', ['uri-id' => $uriId, 'tag-id' => $tagid, 'contact-id' => $cid, 'name' => $name, 'type' => $type, 'callstack' => System::callstack(8)]); + Logger::debug('Stored tag/mention', ['uri-id' => $uriId, 'tag-id' => $tagid, 'contact-id' => $cid, 'name' => $name, 'type' => $type]); } /** @@ -316,7 +316,7 @@ class Tag */ public static function storeFromArray(array $item, string $tags = null) { - Logger::info('Check for tags', ['uri-id' => $item['uri-id'], 'hash' => $tags, 'callstack' => System::callstack()]); + Logger::info('Check for tags', ['uri-id' => $item['uri-id'], 'hash' => $tags]); if (is_null($tags)) { $tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION]; @@ -347,7 +347,7 @@ class Tag */ public static function storeRawTagsFromBody(int $uriId, string $body) { - Logger::info('Check for tags', ['uri-id' => $uriId, 'callstack' => System::callstack()]); + Logger::info('Check for tags', ['uri-id' => $uriId]); $result = BBCode::getTags($body); if (empty($result)) { @@ -396,7 +396,7 @@ class Tag return; } - Logger::debug('Removing tag/mention', ['uri-id' => $uriId, 'tid' => $tag['tid'], 'name' => $name, 'url' => $url, 'callstack' => System::callstack(8)]); + Logger::debug('Removing tag/mention', ['uri-id' => $uriId, 'tid' => $tag['tid'], 'name' => $name, 'url' => $url]); DBA::delete('post-tag', ['uri-id' => $uriId, 'type' => $type, 'tid' => $tag['tid'], 'cid' => $tag['cid']]); } diff --git a/src/Model/User.php b/src/Model/User.php index f985dc2a67..18fecf0803 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -962,7 +962,7 @@ class User public static function getAvatarUrl(array $user, string $size = ''): string { if (empty($user['nickname'])) { - DI::logger()->warning('Missing user nickname key', ['trace' => System::callstack(20)]); + DI::logger()->warning('Missing user nickname key'); } $url = DI::baseUrl() . '/photo/'; @@ -1004,7 +1004,7 @@ class User public static function getBannerUrl(array $user): string { if (empty($user['nickname'])) { - DI::logger()->warning('Missing user nickname key', ['trace' => System::callstack(20)]); + DI::logger()->warning('Missing user nickname key'); } $url = DI::baseUrl() . '/photo/banner/'; diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 6e480c1931..8480a7416b 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -29,7 +29,6 @@ use Friendica\Content\Widget; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBA; @@ -140,7 +139,7 @@ class Contact extends BaseModule try { UpdateContact::add(Worker::PRIORITY_HIGH, $contact_id); } catch (\InvalidArgumentException $e) { - Logger::notice($e->getMessage(), ['contact' => $contact, 'callstack' => System::callstack()]); + Logger::notice($e->getMessage(), ['contact' => $contact]); } } } diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php index f9468e20bc..571c16935c 100644 --- a/src/Module/Special/HTTPException.php +++ b/src/Module/Special/HTTPException.php @@ -138,7 +138,6 @@ class HTTPException 'code' => $e->getCode(), 'description' => $e->getDescription(), 'query' => $this->args->getQueryString(), - 'callstack' => System::callstack(20), 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '' ]); diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php index 2cacaa728f..2f2b0df7da 100644 --- a/src/Navigation/Notifications/Repository/Notify.php +++ b/src/Navigation/Notifications/Repository/Notify.php @@ -226,7 +226,7 @@ class Notify extends BaseRepository // Temporary logging for finding the origin if (!isset($params['uid'])) { - $this->logger->notice('Missing parameters "uid".', ['params' => $params, 'callstack' => System::callstack()]); + $this->logger->notice('Missing parameters "uid".', ['params' => $params]); } // Ensure that the important fields are set at any time diff --git a/src/Network/Factory/MimeType.php b/src/Network/Factory/MimeType.php index eb096582c6..ec76eb8440 100644 --- a/src/Network/Factory/MimeType.php +++ b/src/Network/Factory/MimeType.php @@ -22,7 +22,6 @@ namespace Friendica\Network\Factory; use Friendica\BaseFactory; -use Friendica\Core\System; use Friendica\Network\Entity; /** @@ -43,7 +42,7 @@ class MimeType extends BaseFactory $filetype = strtolower($types[0]); $subtype = strtolower($types[1]); } else { - $this->logger->notice('Unknown MimeType', ['type' => $contentType, 'callstack' => System::callstack(10)]); + $this->logger->notice('Unknown MimeType', ['type' => $contentType]); } $parameters = []; diff --git a/src/Network/HTTPClient/Client/HttpClient.php b/src/Network/HTTPClient/Client/HttpClient.php index d608774eca..bc22aded8b 100644 --- a/src/Network/HTTPClient/Client/HttpClient.php +++ b/src/Network/HTTPClient/Client/HttpClient.php @@ -74,17 +74,17 @@ class HttpClient implements ICanSendHttpRequests } if(!filter_var($host, FILTER_VALIDATE_IP) && !@dns_get_record($host . '.', DNS_A + DNS_AAAA)) { - $this->logger->debug('URL cannot be resolved.', ['url' => $url, 'callstack' => System::callstack(20)]); + $this->logger->debug('URL cannot be resolved.', ['url' => $url]); $this->profiler->stopRecording(); return CurlResult::createErrorCurl($this->logger, $url); } if (Network::isLocalLink($url)) { - $this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]); + $this->logger->info('Local link', ['url' => $url]); } if (strlen($url) > 1000) { - $this->logger->debug('URL is longer than 1000 characters.', ['url' => $url, 'callstack' => System::callstack(20)]); + $this->logger->debug('URL is longer than 1000 characters.', ['url' => $url]); $this->profiler->stopRecording(); return CurlResult::createErrorCurl($this->logger, substr($url, 0, 200)); } @@ -160,7 +160,7 @@ class HttpClient implements ICanSendHttpRequests }; if (empty($conf[HttpClientOptions::HEADERS]['Accept']) && in_array($method, ['get', 'head'])) { - $this->logger->info('Accept header was missing, using default.', ['url' => $url, 'callstack' => System::callstack()]); + $this->logger->info('Accept header was missing, using default.', ['url' => $url]); $conf[HttpClientOptions::HEADERS]['Accept'] = HttpClientAccept::DEFAULT; } @@ -238,7 +238,7 @@ class HttpClient implements ICanSendHttpRequests $this->profiler->startRecording('network'); if (Network::isLocalLink($url)) { - $this->logger->debug('Local link', ['url' => $url, 'callstack' => System::callstack(20)]); + $this->logger->debug('Local link', ['url' => $url]); } if (Network::isUrlBlocked($url)) { diff --git a/src/Network/Probe.php b/src/Network/Probe.php index a0887d5cba..d5a0e285d5 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -27,7 +27,6 @@ use Exception; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -219,7 +218,7 @@ class Probe $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); - Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]); + Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url]); $xrd = null; $curlResult = DI::httpClient()->get($ssl_url, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]); diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index f8c2c4b82b..df19ab8b8f 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -42,7 +42,6 @@ use Friendica\Model\Mail; use Friendica\Model\Tag; use Friendica\Model\User; use Friendica\Model\Post; -use Friendica\Moderation\Entity\Report; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Delivery; @@ -472,7 +471,7 @@ class Processor $item['uri'] = $activity['id']; if (empty($activity['published']) || empty($activity['updated'])) { - DI::logger()->notice('published or updated keys are empty for activity', ['activity' => $activity, 'callstack' => System::callstack(10)]); + DI::logger()->notice('published or updated keys are empty for activity', ['activity' => $activity]); } $item['created'] = DateTimeFormat::utc($activity['published'] ?? 'now'); diff --git a/src/Protocol/ActivityPub/Queue.php b/src/Protocol/ActivityPub/Queue.php index beb8817bfb..47c8e632a7 100644 --- a/src/Protocol/ActivityPub/Queue.php +++ b/src/Protocol/ActivityPub/Queue.php @@ -22,7 +22,6 @@ namespace Friendica\Protocol\ActivityPub; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; @@ -214,7 +213,7 @@ class Queue } } - Logger::debug('Processing queue entry', ['id' => $entry['id'], 'type' => $entry['type'], 'object-type' => $entry['object-type'], 'uri' => $entry['object-id'], 'in-reply-to' => $entry['in-reply-to-id'], 'callstack' => System::callstack(20)]); + Logger::debug('Processing queue entry', ['id' => $entry['id'], 'type' => $entry['type'], 'object-type' => $entry['object-type'], 'uri' => $entry['object-id'], 'in-reply-to' => $entry['in-reply-to-id']]); $activity = json_decode($entry['activity'], true); $type = $entry['type']; diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 4990c03cfd..567fe3b86f 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -625,7 +625,7 @@ class Receiver // $trust_source is called by reference and is set to true if the content was retrieved successfully $object_data = self::prepareObjectData($activity, $uid, $push, $trust_source, $original_actor); if (empty($object_data)) { - Logger::info('No object data found', ['activity' => $activity, 'callstack' => System::callstack(20)]); + Logger::info('No object data found', ['activity' => $activity]); return true; } @@ -1077,7 +1077,7 @@ class Receiver foreach ($receiver_list as $receiver) { if ($receiver == 'Public') { - Logger::warning('Not compacted public collection found', ['activity' => $activity, 'callstack' => System::callstack(20)]); + Logger::warning('Not compacted public collection found', ['activity' => $activity]); $receiver = ActivityPub::PUBLIC_COLLECTION; } if ($receiver == self::PUBLIC_COLLECTION) { @@ -1234,7 +1234,7 @@ class Receiver } elseif (empty($receivers) && in_array($activity_type, ['as:Delete', 'as:Undo'])) { $receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL]; } elseif (empty($receivers)) { - Logger::notice('Post has got no receivers', ['fetch_unlisted' => $fetch_unlisted, 'actor' => $actor, 'id' => JsonLD::fetchElement($activity, '@id'), 'type' => $activity_type, 'callstack' => System::callstack(20)]); + Logger::notice('Post has got no receivers', ['fetch_unlisted' => $fetch_unlisted, 'actor' => $actor, 'id' => JsonLD::fetchElement($activity, '@id'), 'type' => $activity_type]); } return $receivers; diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 72a9c929fa..9e19724fa6 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -347,7 +347,7 @@ class Transmitter { $owner = User::getOwnerDataById($uid); if (!isset($owner['id'])) { - DI::logger()->error('Unable to find owner data for uid', ['uid' => $uid, 'callstack' => System::callstack(20)]); + DI::logger()->error('Unable to find owner data for uid', ['uid' => $uid]); throw new HTTPException\NotFoundException('User not found.'); } diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 8bdb878abe..1aff0efb95 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -796,7 +796,7 @@ class Diaspora */ private static function key(WebFingerUri $uri): string { - Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]); + Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr()]); try { return DI::dsprContact()->getByAddr($uri)->pubKey; } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) { @@ -3022,7 +3022,7 @@ class Diaspora // The "addr" field should always be filled. // If this isn't the case, it will raise a notice some lines later. // And in the log we will see where it came from, and we can handle it there. - Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]); + Logger::notice('Empty addr', ['contact' => $contact ?? []]); } $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey ?? '', $public_batch); diff --git a/src/Protocol/Diaspora/Repository/DiasporaContact.php b/src/Protocol/Diaspora/Repository/DiasporaContact.php index 142988bfdb..3d2fa6641b 100644 --- a/src/Protocol/Diaspora/Repository/DiasporaContact.php +++ b/src/Protocol/Diaspora/Repository/DiasporaContact.php @@ -22,7 +22,6 @@ namespace Friendica\Protocol\Diaspora\Repository; use Friendica\BaseRepository; -use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\Definition\DbaDefinition; use Friendica\Model\APContact; @@ -273,7 +272,7 @@ class DiasporaContact extends BaseRepository $DiasporaContact = $this->save($DiasporaContact); - $this->logger->info('Updated diaspora-contact', ['url' => (string) $DiasporaContact->url, 'callstack' => System::callstack(20)]); + $this->logger->info('Updated diaspora-contact', ['url' => (string) $DiasporaContact->url]); return $DiasporaContact; } diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php index 1781dfb779..20ab9bc528 100644 --- a/src/Util/Crypto.php +++ b/src/Util/Crypto.php @@ -23,7 +23,6 @@ namespace Friendica\Util; use Friendica\Core\Hook; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\DI; use phpseclib3\Crypt\PublicKeyLoader; @@ -42,7 +41,7 @@ class Crypto public static function rsaSign($data, $key, $alg = 'sha256') { if (empty($key)) { - Logger::warning('Empty key parameter', ['callstack' => System::callstack()]); + Logger::warning('Empty key parameter'); } openssl_sign($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); return $sig; @@ -58,7 +57,7 @@ class Crypto public static function rsaVerify($data, $sig, $key, $alg = 'sha256') { if (empty($key)) { - Logger::warning('Empty key parameter', ['callstack' => System::callstack()]); + Logger::warning('Empty key parameter'); } return openssl_verify($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); } diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 427205958f..aa83d938a4 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -208,7 +208,7 @@ class JsonLD Logger::notice('compacting error', ['msg' => $e->getMessage(), 'previous' => $e->getPrevious(), 'line' => $e->getLine()]); if ($logfailed && DI::config()->get('debug', 'ap_log_failure')) { $tempfile = tempnam(System::getTempPath(), 'failed-jsonld'); - file_put_contents($tempfile, json_encode(['json' => $orig_json, 'callstack' => System::callstack(20), 'msg' => $e->getMessage(), 'previous' => $e->getPrevious()], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); + file_put_contents($tempfile, json_encode(['json' => $orig_json, 'msg' => $e->getMessage(), 'previous' => $e->getPrevious()], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); Logger::notice('Failed message stored', ['file' => $tempfile]); } } diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php index 9b160a1064..8d79b05dd8 100644 --- a/src/Util/Proxy.php +++ b/src/Util/Proxy.php @@ -116,7 +116,7 @@ class Proxy $size = ':' . $size; } - Logger::info('Created proxy link', ['url' => $url, 'callstack' => System::callstack(20)]); + Logger::info('Created proxy link', ['url' => $url]); // Too long files aren't supported by Apache if (strlen($proxypath) > 250) { diff --git a/src/Util/Strings.php b/src/Util/Strings.php index bc1a0e4be9..12503528fb 100644 --- a/src/Util/Strings.php +++ b/src/Util/Strings.php @@ -23,7 +23,6 @@ namespace Friendica\Util; use Friendica\Content\ContactSelector; use Friendica\Core\Logger; -use Friendica\Core\System; use ParagonIE\ConstantTime\Base64; /** @@ -511,7 +510,7 @@ class Strings ); if (is_null($return)) { - Logger::notice('Received null value from preg_replace_callback', ['text' => $text, 'regex' => $regex, 'blocks' => $blocks, 'executionId' => $executionId, 'callstack' => System::callstack(10)]); + Logger::notice('Received null value from preg_replace_callback', ['text' => $text, 'regex' => $regex, 'blocks' => $blocks, 'executionId' => $executionId]); } $text = $callback($return ?? $text) ?? ''; diff --git a/src/Util/XML.php b/src/Util/XML.php index c35f19b8a8..e1910ce47d 100644 --- a/src/Util/XML.php +++ b/src/Util/XML.php @@ -26,7 +26,6 @@ use DOMElement; use DOMNode; use DOMXPath; use Friendica\Core\Logger; -use Friendica\Core\System; use SimpleXMLElement; /** @@ -451,7 +450,7 @@ class XML $x = @simplexml_load_string($s); if (!$x) { if (!$suppress_log) { - Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]); + Logger::error('Error(s) while parsing XML string.'); foreach (libxml_get_errors() as $err) { Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ':' . $err->column, 'message' => $err->message]); } -- 2.39.5