Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix log sets

Browse source
This commit is contained in:
Jake Barnby 2025-10-23 16:49:37 +13:00
parent c86702430b
commit 2a4f191a69
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Appwrite/Platform/Workers/Migrations.php
View file

@ -248,9 +248,13 @@ class Migrations extends Action
$errors = $migration->getAttribute('errors', []); $errors = $migration->getAttribute('errors', []);
foreach ($errors as $error) { foreach ($errors as $error) {
$decoded = \json_decode($error, true); $decoded = \json_decode($error, true);
if (\is_array($decoded) && isset($decoded['trace'])) { if (\is_array($decoded)) {
unset($decoded['trace']); if (isset($decoded['trace'])) {
unset($decoded['trace']);
}
$messages[] = json_encode($decoded); $messages[] = json_encode($decoded);
} else {
$messages[] = $error;
} }
} }
@ -387,7 +391,15 @@ class Migrations extends Action
$errors = []; $errors = [];
foreach ([...$sourceErrors, ...$destinationErrors] as $error) { foreach ([...$sourceErrors, ...$destinationErrors] as $error) {
$errors[] = \json_encode($error); $encoded = \json_decode(\json_encode($error), true);
if (\is_array($encoded)) {
if (isset($encoded['trace'])) {
unset($encoded['trace']);
}
$errors[] = \json_encode($encoded);
} else {
$errors[] = \json_encode($error);
}
} }
$migration->setAttribute('errors', $errors); $migration->setAttribute('errors', $errors);
@ -419,7 +431,15 @@ class Migrations extends Action
$errors = []; $errors = [];
foreach ([...$sourceErrors, ...$destinationErrors] as $error) { foreach ([...$sourceErrors, ...$destinationErrors] as $error) {
$errors[] = \json_encode($error); $encoded = \json_decode(\json_encode($error), true);
if (\is_array($encoded)) {
if (isset($encoded['trace'])) {
unset($encoded['trace']);
}
$errors[] = \json_encode($encoded);
} else {
$errors[] = \json_encode($error);
}
} }
$migration->setAttribute('errors', $errors); $migration->setAttribute('errors', $errors);

8
src/Appwrite/Utopia/Response/Model/Migration.php
View file

@ -126,10 +126,10 @@ class Migration extends Model
$decoded = \json_decode($error, true); $decoded = \json_decode($error, true);
if (\is_array($decoded)) { if (\is_array($decoded)) {
$errors[$index] = \json_encode([ if (isset($decoded['trace'])) {
'code' => $decoded['code'] ?? 0, unset($decoded['trace']);
'message' => $decoded['message'] ?? null, }
]); $errors[$index] = \json_encode($decoded);
} }
} }