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

Merge pull request #6775 from annando/issue-6395

Browse source 
Issue 6395: Don't log details to avoid memory issues
This commit is contained in:
Tobias Diekershoff 2019-02-28 10:17:01 +01:00 committed by GitHub
parent 3aad29358c 0b2cdf5d26
commit 53952bb426
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Util/JsonLD.php
View file

@ -35,7 +35,7 @@ class JsonLD
} }
if ($recursion > 5) { if ($recursion > 5) {
Logger::log('jsonld bomb detected at: ' . $url); Logger::error('jsonld bomb detected at: ' . $url);
exit(); exit();
} }
@ -68,7 +68,9 @@ class JsonLD
} }
catch (Exception $e) { catch (Exception $e) {
$normalized = false; $normalized = false;
Logger::log('normalise error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG); Logger::error('normalise error');
// Sooner or later we should log some details as well - but currently this leads to memory issues
// Logger::log('normalise error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
} }
return $normalized; return $normalized;
@ -115,7 +117,9 @@ class JsonLD
} }
catch (Exception $e) { catch (Exception $e) {
$compacted = false; $compacted = false;
Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG); Logger::error('compacting error');
// Sooner or later we should log some details as well - but currently this leads to memory issues
// Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
} }
$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true); $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);