From 0924271abe084870ee3c51dd3de0fae46b06a8cc Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Wed, 13 Apr 2022 17:02:25 +0000 Subject: [PATCH] Catch avatar export separately for better failure tracing Signed-off-by: Christopher Ng --- apps/settings/lib/UserMigration/AccountMigrator.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/settings/lib/UserMigration/AccountMigrator.php b/apps/settings/lib/UserMigration/AccountMigrator.php index 32cf898f2bc..7b60a101cee 100644 --- a/apps/settings/lib/UserMigration/AccountMigrator.php +++ b/apps/settings/lib/UserMigration/AccountMigrator.php @@ -77,7 +77,11 @@ class AccountMigrator implements IMigrator { try { $account = $this->accountManager->getAccount($user); $exportDestination->addFileContents(AccountMigrator::PATH_ACCOUNT_FILE, json_encode($account)); + } catch (Throwable $e) { + throw new AccountMigratorException('Could not export account information', 0, $e); + } + try { $avatar = $this->avatarManager->getAvatar($user->getUID()); if ($avatar->isCustomAvatar()) { $avatarFile = $avatar->getFile(-1); @@ -87,7 +91,7 @@ class AccountMigrator implements IMigrator { $exportDestination->addFileAsStream($exportPath, $avatarFile->read()); } } catch (Throwable $e) { - throw new AccountMigratorException('Could not export account information', 0, $e); + throw new AccountMigratorException('Could not export avatar', 0, $e); } } -- 2.39.5