Skip to content

Improve log messages for encryption rename #40875

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
pako81 merged 1 commit into from
Jul 14, 2023
Merged

Improve log messages for encryption rename #40875

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
6 changes: 3 additions & 3 deletions lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,17 @@ public function rename($path1, $path2) {
if ($renameOk) {
$sourceKeyDeleteOk = $this->keyStorage->deleteAllFileKeys($source);
if (!$sourceKeyDeleteOk) {
$this->logger->error("Renaming {$path1} to {$path2} succeeded, but key {$target} wasn't deleted from the original location in {$source}");
$this->logger->error("Renaming {$path1} to {$path2} succeeded, but key for file {$target} wasn't removed from its original location");
}
} else {
$this->logger->error("Renaming {$path1} to {$path2} failed");
$targetKeyDeleteOk = $this->keyStorage->deleteAllFileKeys($target);
if (!$targetKeyDeleteOk) {
$this->logger->error("Copied key {$source} wasn't removed from the target location in {$target}");
$this->logger->error("Copied key for file {$source} wasn't removed from its target location");
}
}
} else {
$this->logger->error("Failed to copied keys from {$source} to {$target} while renaming {$path1} to {$path2}");
$this->logger->error("Failed to copy keys while renaming {$path1} to {$path2}");
}

return $renameOk && $copyKeysOk;
Expand Down