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

Merge pull request #13561 from annando/log-callstack 

Individual callstacks are removed from the logger
This commit is contained in:
Hypolite Petovan 2023-10-18 16:02:08 -04:00 committed by GitHub
parent d05fbe6e45 e4a37f344e
commit f56054ecc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 66 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BaseModule.php
View File

@ -33,7 +33,6 @@ use Friendica\Module\Response;
use Friendica\Module\Special\HTTPException as ModuleHTTPException; use Friendica\Module\Special\HTTPException as ModuleHTTPException;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
use Friendica\Util\XML;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -494,7 +493,7 @@ abstract class BaseModule implements ICanHandleRequests
public function httpError(int $httpCode, string $message = '', $content = '') public function httpError(int $httpCode, string $message = '', $content = '')
{ {
if ($httpCode >= 400) { 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); $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') public function jsonError(int $httpCode, $content, string $content_type = 'application/json')
{ {
if ($httpCode >= 400) { 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); $this->response->setStatus($httpCode);

3
src/Content/Text/Markdown.php
View File

@ -22,7 +22,6 @@
namespace Friendica\Content\Text; namespace Friendica\Content\Text;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; 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 // @TODO Temporary until we find the source of the null value to finally set the correct type-hint
if (is_null($s)) { if (is_null($s)) {
Logger::warning('Received null value', ['callstack' => System::callstack()]); Logger::warning('Received null value');
return ''; return '';
} }

3
src/Content/Widget/VCard.php
View File

@ -26,7 +26,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Util\Network; use Friendica\Util\Network;
@ -48,7 +47,7 @@ class VCard
public static function getHTML(array $contact): string public static function getHTML(array $contact): string
{ {
if (!isset($contact['network']) || !isset($contact['id'])) { 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'])) { if (!Network::isValidHttpUrl($contact['url']) && Network::isValidHttpUrl($contact['alias'])) {

2
src/Core/Logger/Util/Introspection.php
View File

@ -87,7 +87,7 @@ class Introspection implements IHaveCallIntrospections
'line' => $trace[$i - 1]['line'] ?? null, 'line' => $trace[$i - 1]['line'] ?? null,
'function' => $trace[$i]['function'] ?? null, 'function' => $trace[$i]['function'] ?? null,
'request-id' => $this->requestId, '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']),
]; ];
} }

6
src/Core/System.php
View File

@ -220,7 +220,7 @@ class System
proc_close($resource); 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 = '') public static function httpError($httpCode, $message = '', $content = '')
{ {
if ($httpCode >= 400) { 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); DI::apiResponse()->setStatus($httpCode, $message);
@ -381,7 +381,7 @@ class System
public static function jsonError($httpCode, $content, $content_type = 'application/json') public static function jsonError($httpCode, $content, $content_type = 'application/json')
{ {
if ($httpCode >= 400) { 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); DI::apiResponse()->setStatus($httpCode);
self::jsonExit($content, $content_type); self::jsonExit($content, $content_type);

2
src/Core/Worker.php
View File

@ -1276,7 +1276,7 @@ class Worker
$added = 0; $added = 0;
if (!is_int($priority) || !in_array($priority, self::PRIORITIES)) { 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; $priority = self::PRIORITY_MEDIUM;
} }

6
src/Database/Database.php
View File

@ -528,7 +528,7 @@ class Database
if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) { if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
// Question: Should we continue or stop the query here? // 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); $sql = DBA::cleanQuery($sql);
@ -702,7 +702,6 @@ class Database
$this->logger->error('DB Error', [ $this->logger->error('DB Error', [
'code' => $errorno, 'code' => $errorno,
'error' => $error, 'error' => $error,
'callstack' => System::callstack(8),
'params' => $this->replaceParameters($sql, $args), 'params' => $this->replaceParameters($sql, $args),
]); ]);
@ -810,7 +809,6 @@ class Database
$this->logger->error('DB Error', [ $this->logger->error('DB Error', [
'code' => $errorno, 'code' => $errorno,
'error' => $error, 'error' => $error,
'callstack' => System::callstack(8),
'params' => $this->replaceParameters($sql, $params), 'params' => $this->replaceParameters($sql, $params),
]); ]);
@ -1292,7 +1290,7 @@ class Database
$condition_string = DBA::buildCondition($conditions); $condition_string = DBA::buildCondition($conditions);
$sql = "DELETE FROM " . $table_string . " " . $condition_string; $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); return $this->e($sql, $conditions);
} }

2
src/Model/APContact.php
View File

@ -176,7 +176,7 @@ class APContact
$cachekey = 'apcontact:' . ItemURI::getIdByURI($url); $cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
$result = DI::cache()->get($cachekey); $result = DI::cache()->get($cachekey);
if (!is_null($result)) { 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)) { if (!empty($fetched_contact)) {
return $fetched_contact; return $fetched_contact;
} }

14
src/Model/Contact.php
View File

@ -1081,7 +1081,7 @@ class Contact
return; return;
} }
} elseif (!isset($contact['url'])) { } 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']]); 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)) { 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 = $personal_contact;
$data['photo'] = $personal_contact['avatar']; $data['photo'] = $personal_contact['avatar'];
$data['account-type'] = $personal_contact['contact-type']; $data['account-type'] = $personal_contact['contact-type'];
@ -1378,7 +1378,7 @@ class Contact
} }
if (empty($data['network']) || ($data['network'] == Protocol::PHANTOM)) { 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; return 0;
} }
@ -2576,7 +2576,7 @@ class Contact
Worker::add(Worker::PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid); Worker::add(Worker::PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
} }
DBA::close($duplicates); 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; return true;
} }
@ -2599,7 +2599,7 @@ class Contact
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
self::updateFromProbe($id); 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; return true;
} }
@ -2839,7 +2839,7 @@ class Contact
} }
$ret['last-item'] = Probe::getLastUpdate($ret); $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; $update = false;
@ -3370,7 +3370,7 @@ class Contact
} elseif (!empty($contact['id'])) { } elseif (!empty($contact['id'])) {
self::remove($contact['id']); self::remove($contact['id']);
} else { } 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; return;
} }

3
src/Model/Contact/User.php
View File

@ -24,7 +24,6 @@ namespace Friendica\Model\Contact;
use Exception; use Exception;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -55,7 +54,7 @@ class User
} }
if (empty($contact['uri-id']) && empty($contact['url'])) { 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; return false;
} }

5
src/Model/GServer.php
View File

@ -26,7 +26,6 @@ use DOMXPath;
use Exception; use Exception;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
@ -126,7 +125,7 @@ class GServer
$gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]); $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]);
if (DBA::isResult($gserver)) { 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)) { if (Network::isUrlBlocked($url)) {
self::setBlockedById($gserver['id']); 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]); self::update(['protocol' => $protocol], ['id' => $gsid]);
} }

8
src/Model/Item.php
View File

@ -330,7 +330,7 @@ class Item
*/ */
public static function markForDeletionById(int $item_id, int $priority = Worker::PRIORITY_HIGH): bool 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 // locate item to be deleted
$fields = [ $fields = [
'id', 'uri', 'uri-id', 'uid', 'parent', 'parent-uri-id', 'origin', 'id', 'uri', 'uri-id', 'uid', 'parent', 'parent-uri-id', 'origin',
@ -795,7 +795,7 @@ class Item
} }
if (!DBA::isResult($parent)) { 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 []; return [];
} }
@ -1183,7 +1183,7 @@ class Item
if (!empty($quote_id)) { if (!empty($quote_id)) {
// This is one of these "should not happen" situations. // This is one of these "should not happen" situations.
// The protocol implementations should already have done this job. // 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; $item['quote-uri-id'] = $quote_id;
} }
} }
@ -2162,7 +2162,7 @@ class Item
$hostPart = $host ?: $parsed['host'] ?? ''; $hostPart = $host ?: $parsed['host'] ?? '';
if (!$hostPart) { 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 // Glue it together to be able to make a hash from it

2
src/Model/Photo.php
View File

@ -589,7 +589,7 @@ class Photo
$photo_failure = false; $photo_failure = false;
if (!Network::isValidHttpUrl($image_url)) { 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; return false;
} }

3
src/Model/Post.php
View File

@ -23,7 +23,6 @@ namespace Friendica\Model;
use BadMethodCallException; use BadMethodCallException;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -611,7 +610,7 @@ class Post
{ {
$affected = 0; $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 // Don't allow changes to fields that are responsible for the relation between the records
unset($fields['id']); unset($fields['id']);

3
src/Model/Post/Link.php
View File

@ -22,7 +22,6 @@
namespace Friendica\Model\Post; namespace Friendica\Model\Post;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -67,7 +66,7 @@ class Link
} }
if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https'])) { 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; return $url;
} }

9
src/Model/Post/Media.php
View File

@ -25,7 +25,6 @@ use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -79,7 +78,7 @@ class Media
} }
if (DBA::exists('post-media', ['uri-id' => $media['uri-id'], 'preview' => $media['url']])) { 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; return false;
} }
@ -87,12 +86,12 @@ class Media
// and embedded as picture then we only store the picture or replace the document // 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']]); $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))) { 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; return false;
} }
if (!ItemURI::exists($media['uri-id'])) { 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; return false;
} }
@ -102,7 +101,7 @@ class Media
// We are storing as fast as possible to avoid duplicated network requests // We are storing as fast as possible to avoid duplicated network requests
// when fetching additional information for pictures and other content. // when fetching additional information for pictures and other content.
$result = DBA::insert('post-media', $media, Database::INSERT_UPDATE); $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; $stored = $media;
$media = self::fetchAdditionalData($media); $media = self::fetchAdditionalData($media);

4
src/Model/Profile.php
View File

@ -228,7 +228,7 @@ class Profile
// System user, aborting // System user, aborting
if ($profile['uid'] === 0) { 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.')); throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
} }
@ -450,7 +450,7 @@ class Profile
$p['url'] = Contact::magicLinkById($cid, $profile['url']); $p['url'] = Contact::magicLinkById($cid, $profile['url']);
if (!isset($profile['hidewall'])) { 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) { if ($profile['account-type'] == Contact::TYPE_COMMUNITY) {

10
src/Model/Tag.php
View File

@ -112,7 +112,7 @@ class Tag
} }
if ((substr($url, 0, 7) == 'https//') || (substr($url, 0, 6) == 'http//')) { 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); $cid = Contact::getIdForURL($url, 0, false);
@ -159,7 +159,7 @@ class Tag
DBA::insert('post-tag', $fields, Database::INSERT_IGNORE); 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) 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)) { if (is_null($tags)) {
$tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION]; $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) 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); $result = BBCode::getTags($body);
if (empty($result)) { if (empty($result)) {
@ -396,7 +396,7 @@ class Tag
return; 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']]); DBA::delete('post-tag', ['uri-id' => $uriId, 'type' => $type, 'tid' => $tag['tid'], 'cid' => $tag['cid']]);
} }

4
src/Model/User.php
View File

@ -962,7 +962,7 @@ class User
public static function getAvatarUrl(array $user, string $size = ''): string public static function getAvatarUrl(array $user, string $size = ''): string
{ {
if (empty($user['nickname'])) { 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/'; $url = DI::baseUrl() . '/photo/';
@ -1004,7 +1004,7 @@ class User
public static function getBannerUrl(array $user): string public static function getBannerUrl(array $user): string
{ {
if (empty($user['nickname'])) { 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/'; $url = DI::baseUrl() . '/photo/banner/';

3
src/Module/Contact.php
View File

@ -29,7 +29,6 @@ use Friendica\Content\Widget;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Theme; use Friendica\Core\Theme;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
@ -140,7 +139,7 @@ class Contact extends BaseModule
try { try {
UpdateContact::add(Worker::PRIORITY_HIGH, $contact_id); UpdateContact::add(Worker::PRIORITY_HIGH, $contact_id);
} catch (\InvalidArgumentException $e) { } catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact, 'callstack' => System::callstack()]); Logger::notice($e->getMessage(), ['contact' => $contact]);
} }
} }
} }

1
src/Module/Special/HTTPException.php
View File

@ -138,7 +138,6 @@ class HTTPException
'code' => $e->getCode(), 'code' => $e->getCode(),
'description' => $e->getDescription(), 'description' => $e->getDescription(),
'query' => $this->args->getQueryString(), 'query' => $this->args->getQueryString(),
'callstack' => System::callstack(20),
'method' => $this->args->getMethod(), 'method' => $this->args->getMethod(),
'agent' => $this->server['HTTP_USER_AGENT'] ?? '' 'agent' => $this->server['HTTP_USER_AGENT'] ?? ''
]); ]);

2
src/Navigation/Notifications/Repository/Notify.php
View File

@ -226,7 +226,7 @@ class Notify extends BaseRepository
// Temporary logging for finding the origin // Temporary logging for finding the origin
if (!isset($params['uid'])) { 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 // Ensure that the important fields are set at any time

3
src/Network/Factory/MimeType.php
View File

@ -22,7 +22,6 @@
namespace Friendica\Network\Factory; namespace Friendica\Network\Factory;
use Friendica\BaseFactory; use Friendica\BaseFactory;
use Friendica\Core\System;
use Friendica\Network\Entity; use Friendica\Network\Entity;
/** /**
@ -43,7 +42,7 @@ class MimeType extends BaseFactory
$filetype = strtolower($types[0]); $filetype = strtolower($types[0]);
$subtype = strtolower($types[1]); $subtype = strtolower($types[1]);
} else { } else {
$this->logger->notice('Unknown MimeType', ['type' => $contentType, 'callstack' => System::callstack(10)]); $this->logger->notice('Unknown MimeType', ['type' => $contentType]);
} }
$parameters = []; $parameters = [];

10
src/Network/HTTPClient/Client/HttpClient.php
View File

@ -74,17 +74,17 @@ class HttpClient implements ICanSendHttpRequests
} }
if(!filter_var($host, FILTER_VALIDATE_IP) && !@dns_get_record($host . '.', DNS_A + DNS_AAAA)) { 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(); $this->profiler->stopRecording();
return CurlResult::createErrorCurl($this->logger, $url); return CurlResult::createErrorCurl($this->logger, $url);
} }
if (Network::isLocalLink($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) { 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(); $this->profiler->stopRecording();
return CurlResult::createErrorCurl($this->logger, substr($url, 0, 200)); 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'])) { 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; $conf[HttpClientOptions::HEADERS]['Accept'] = HttpClientAccept::DEFAULT;
} }
@ -238,7 +238,7 @@ class HttpClient implements ICanSendHttpRequests
$this->profiler->startRecording('network'); $this->profiler->startRecording('network');
if (Network::isLocalLink($url)) { 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)) { if (Network::isUrlBlocked($url)) {

3
src/Network/Probe.php
View File

@ -27,7 +27,6 @@ use Exception;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
@ -219,7 +218,7 @@ class Probe
$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); $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; $xrd = null;
$curlResult = DI::httpClient()->get($ssl_url, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]); $curlResult = DI::httpClient()->get($ssl_url, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]);

3
src/Protocol/ActivityPub/Processor.php
View File

@ -42,7 +42,6 @@ use Friendica\Model\Mail;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Moderation\Entity\Report;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Delivery; use Friendica\Protocol\Delivery;
@ -472,7 +471,7 @@ class Processor
$item['uri'] = $activity['id']; $item['uri'] = $activity['id'];
if (empty($activity['published']) || empty($activity['updated'])) { 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'); $item['created'] = DateTimeFormat::utc($activity['published'] ?? 'now');

3
src/Protocol/ActivityPub/Queue.php
View File

@ -22,7 +22,6 @@
namespace Friendica\Protocol\ActivityPub; namespace Friendica\Protocol\ActivityPub;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; 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); $activity = json_decode($entry['activity'], true);
$type = $entry['type']; $type = $entry['type'];

6
src/Protocol/ActivityPub/Receiver.php
View File

@ -625,7 +625,7 @@ class Receiver
// $trust_source is called by reference and is set to true if the content was retrieved successfully // $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); $object_data = self::prepareObjectData($activity, $uid, $push, $trust_source, $original_actor);
if (empty($object_data)) { 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; return true;
} }
@ -1077,7 +1077,7 @@ class Receiver
foreach ($receiver_list as $receiver) { foreach ($receiver_list as $receiver) {
if ($receiver == 'Public') { 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; $receiver = ActivityPub::PUBLIC_COLLECTION;
} }
if ($receiver == self::PUBLIC_COLLECTION) { if ($receiver == self::PUBLIC_COLLECTION) {
@ -1234,7 +1234,7 @@ class Receiver
} elseif (empty($receivers) && in_array($activity_type, ['as:Delete', 'as:Undo'])) { } elseif (empty($receivers) && in_array($activity_type, ['as:Delete', 'as:Undo'])) {
$receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL]; $receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
} elseif (empty($receivers)) { } 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; return $receivers;

2
src/Protocol/ActivityPub/Transmitter.php
View File

@ -347,7 +347,7 @@ class Transmitter
{ {
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
if (!isset($owner['id'])) { 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.'); throw new HTTPException\NotFoundException('User not found.');
} }

4
src/Protocol/Diaspora.php
View File

@ -796,7 +796,7 @@ class Diaspora
*/ */
private static function key(WebFingerUri $uri): string 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 { try {
return DI::dsprContact()->getByAddr($uri)->pubKey; return DI::dsprContact()->getByAddr($uri)->pubKey;
} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) { } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
@ -3022,7 +3022,7 @@ class Diaspora
// The "addr" field should always be filled. // The "addr" field should always be filled.
// If this isn't the case, it will raise a notice some lines later. // 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. // 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); $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey ?? '', $public_batch);

3
src/Protocol/Diaspora/Repository/DiasporaContact.php
View File

@ -22,7 +22,6 @@
namespace Friendica\Protocol\Diaspora\Repository; namespace Friendica\Protocol\Diaspora\Repository;
use Friendica\BaseRepository; use Friendica\BaseRepository;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\Definition\DbaDefinition; use Friendica\Database\Definition\DbaDefinition;
use Friendica\Model\APContact; use Friendica\Model\APContact;
@ -273,7 +272,7 @@ class DiasporaContact extends BaseRepository
$DiasporaContact = $this->save($DiasporaContact); $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; return $DiasporaContact;
} }

5
src/Util/Crypto.php
View File

@ -23,7 +23,6 @@ namespace Friendica\Util;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use phpseclib3\Crypt\PublicKeyLoader; use phpseclib3\Crypt\PublicKeyLoader;
@ -42,7 +41,7 @@ class Crypto
public static function rsaSign($data, $key, $alg = 'sha256') public static function rsaSign($data, $key, $alg = 'sha256')
{ {
if (empty($key)) { 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)); openssl_sign($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
return $sig; return $sig;
@ -58,7 +57,7 @@ class Crypto
public static function rsaVerify($data, $sig, $key, $alg = 'sha256') public static function rsaVerify($data, $sig, $key, $alg = 'sha256')
{ {
if (empty($key)) { 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)); return openssl_verify($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
} }

2
src/Util/JsonLD.php
View File

@ -208,7 +208,7 @@ class JsonLD
Logger::notice('compacting error', ['msg' => $e->getMessage(), 'previous' => $e->getPrevious(), 'line' => $e->getLine()]); Logger::notice('compacting error', ['msg' => $e->getMessage(), 'previous' => $e->getPrevious(), 'line' => $e->getLine()]);
if ($logfailed && DI::config()->get('debug', 'ap_log_failure')) { if ($logfailed && DI::config()->get('debug', 'ap_log_failure')) {
$tempfile = tempnam(System::getTempPath(), 'failed-jsonld'); $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]); Logger::notice('Failed message stored', ['file' => $tempfile]);
} }
} }

2
src/Util/Proxy.php
View File

@ -116,7 +116,7 @@ class Proxy
$size = ':' . $size; $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 // Too long files aren't supported by Apache
if (strlen($proxypath) > 250) { if (strlen($proxypath) > 250) {

3
src/Util/Strings.php
View File

@ -23,7 +23,6 @@ namespace Friendica\Util;
use Friendica\Content\ContactSelector; use Friendica\Content\ContactSelector;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use ParagonIE\ConstantTime\Base64; use ParagonIE\ConstantTime\Base64;
/** /**
@ -511,7 +510,7 @@ class Strings
); );
if (is_null($return)) { 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) ?? ''; $text = $callback($return ?? $text) ?? '';

3
src/Util/XML.php
View File

@ -26,7 +26,6 @@ use DOMElement;
use DOMNode; use DOMNode;
use DOMXPath; use DOMXPath;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use SimpleXMLElement; use SimpleXMLElement;
/** /**
@ -451,7 +450,7 @@ class XML
$x = @simplexml_load_string($s); $x = @simplexml_load_string($s);
if (!$x) { if (!$x) {
if (!$suppress_log) { 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) { foreach (libxml_get_errors() as $err) {
Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ':' . $err->column, 'message' => $err->message]); Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ':' . $err->column, 'message' => $err->message]);
} }