mirror of
https://github.com/appwrite/appwrite
synced 2026-05-22 08:28:42 +00:00
Fix log sets
This commit is contained in:
parent
c86702430b
commit
2a4f191a69
2 changed files with 28 additions and 8 deletions
|
|
@ -248,9 +248,13 @@ class Migrations extends Action
|
|||
$errors = $migration->getAttribute('errors', []);
|
||||
foreach ($errors as $error) {
|
||||
$decoded = \json_decode($error, true);
|
||||
if (\is_array($decoded) && isset($decoded['trace'])) {
|
||||
unset($decoded['trace']);
|
||||
if (\is_array($decoded)) {
|
||||
if (isset($decoded['trace'])) {
|
||||
unset($decoded['trace']);
|
||||
}
|
||||
$messages[] = json_encode($decoded);
|
||||
} else {
|
||||
$messages[] = $error;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -387,7 +391,15 @@ class Migrations extends Action
|
|||
|
||||
$errors = [];
|
||||
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);
|
||||
|
|
@ -419,7 +431,15 @@ class Migrations extends Action
|
|||
|
||||
$errors = [];
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -126,10 +126,10 @@ class Migration extends Model
|
|||
$decoded = \json_decode($error, true);
|
||||
|
||||
if (\is_array($decoded)) {
|
||||
$errors[$index] = \json_encode([
|
||||
'code' => $decoded['code'] ?? 0,
|
||||
'message' => $decoded['message'] ?? null,
|
||||
]);
|
||||
if (isset($decoded['trace'])) {
|
||||
unset($decoded['trace']);
|
||||
}
|
||||
$errors[$index] = \json_encode($decoded);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue