From 77e3dec6ed093860b21a8da429d3aba621c5d53f Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Thu, 2 May 2024 01:31:31 +0900 Subject: [PATCH] Update Migrations.php --- src/Appwrite/Platform/Workers/Migrations.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php index 7bbfcfbce2..6959406cc0 100644 --- a/src/Appwrite/Platform/Workers/Migrations.php +++ b/src/Appwrite/Platform/Workers/Migrations.php @@ -85,6 +85,7 @@ class Migrations extends Action return; } + $log->addTag('migrationId', $migration->getId()); $log->addTag('projectId', $project->getId()); $this->processMigration($project, $migration, $log); @@ -256,6 +257,7 @@ class Migrations extends Action $migrationDocument = $this->dbForProject->getDocument('migrations', $migration->getId()); $migrationDocument->setAttribute('stage', 'processing'); $migrationDocument->setAttribute('status', 'processing'); + $log->addTag('stage', 'processing'); $this->updateMigrationDocument($migrationDocument, $projectDocument); $log->addTag('type', $migrationDocument->getAttribute('source')); @@ -277,6 +279,7 @@ class Migrations extends Action /** Start Transfer */ $migrationDocument->setAttribute('stage', 'migrating'); + $log->addTag('stage', 'migrating'); $this->updateMigrationDocument($migrationDocument, $projectDocument); $transfer->run($migrationDocument->getAttribute('resources'), function () use ($migrationDocument, $transfer, $projectDocument) { $migrationDocument->setAttribute('resourceData', json_encode($transfer->getCache())); @@ -291,6 +294,7 @@ class Migrations extends Action if (!empty($sourceErrors) || !empty($destinationErrors)) { $migrationDocument->setAttribute('status', 'failed'); $migrationDocument->setAttribute('stage', 'finished'); + $log->addTag('stage', 'finished'); $errorMessages = []; foreach ($sourceErrors as $error) { @@ -303,9 +307,8 @@ class Migrations extends Action } $migrationDocument->setAttribute('errors', $errorMessages); + $log->addExtra('migrationErrors', json_encode($errorMessages)); $this->updateMigrationDocument($migrationDocument, $projectDocument); - - return; } $migrationDocument->setAttribute('status', 'completed'); @@ -338,6 +341,7 @@ class Migrations extends Action } $migrationDocument->setAttribute('errors', $errorMessages); + $log->addTag('migrationErrors', json_encode($errorMessages)); } } finally { if ($tempAPIKey) { @@ -347,9 +351,9 @@ class Migrations extends Action $this->updateMigrationDocument($migrationDocument, $projectDocument); if ($migrationDocument->getAttribute('status', '') == 'failed') { - throw new Exception(implode("\n", $migrationDocument->getAttribute('errors', []))); + throw new Exception("Migration failed"); } } } } -} +} \ No newline at end of file