Skip to content

Catch avatar export separately for better failure tracing #31969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 1 commit into from
Apr 13, 2022
Merged

Catch avatar export separately for better failure tracing #31969

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Catch avatar export separately for better failure tracing 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal
Pytal committed Apr 13, 2022
commit 0924271abe084870ee3c51dd3de0fae46b06a8cc
6 changes: 5 additions & 1 deletion apps/settings/lib/UserMigration/AccountMigrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,11 @@ public function export(IUser $user, IExportDestination $exportDestination, Outpu
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);
Expand All @@ -87,7 +91,7 @@ public function export(IUser $user, IExportDestination $exportDestination, Outpu
$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);
}
}

Expand Down