Skip to content
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

Hard link serve panic fix #2210

Merged
merged 5 commits into from
May 6, 2023
+6 −1
Merged

Hard link serve panic fix #2210

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e048f93
Fix hard link panic and add better error info to std:fs errors
Raymi306 May 2, 2023
bcc70d5
cargo fmt
Raymi306 May 2, 2023
defd3eb
Remove erroneously committed config change
Raymi306 May 3, 2023
f95b4f5
Remove console import; Use with context to provide additional error info
Raymi306 May 4, 2023
da93fbe
improve error wording
Raymi306 May 5, 2023
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
7 changes: 6 additions & 1 deletion components/utils/src/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ pub fn copy_file_if_needed(src: &Path, dest: &Path, hard_link: bool) -> Result<(
}

if hard_link {
std::fs::hard_link(src, dest)?
if dest.exists() {
std::fs::remove_file(dest)
.with_context(|| format!("Error removing file, dst: {:?}", dest))?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dst is not going to be clear to the end error, just put Error removing file: {:?}

}
std::fs::hard_link(src, dest)
.with_context(|| format!("Error linking file, src: {:?}, dst: {:?}", src, dest))?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error linking file -> Error hard linking file

} else {
let src_metadata = metadata(src)
.with_context(|| format!("Failed to get metadata of {}", src.display()))?;
Expand Down