Skip to content

Commit 72d5f84

Browse files
committed
Don't error out on mtime failure
mtime is a nice to have, just default to 1980 if any part of getting it fails.
1 parent 04e7736 commit 72d5f84

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

nexus/src/app/background/tasks/support_bundle_collector.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,9 +1243,15 @@ fn recursively_add_directory_to_zipfile(
12431243
if file_type.is_file() {
12441244
let src = entry.path();
12451245

1246-
let system_mtime = entry.metadata().and_then(|m| m.modified())?;
1247-
let zoned = jiff::Zoned::try_from(system_mtime)?;
1248-
let zip_time = zip::DateTime::try_from(zoned.datetime())?;
1246+
let zip_time = entry
1247+
.metadata()
1248+
.and_then(|m| m.modified())
1249+
.ok()
1250+
.and_then(|sys_time| jiff::Zoned::try_from(sys_time).ok())
1251+
.and_then(|zoned| {
1252+
zip::DateTime::try_from(zoned.datetime()).ok()
1253+
})
1254+
.unwrap_or_else(zip::DateTime::default);
12491255

12501256
let opts = FullFileOptions::default()
12511257
.last_modified_time(zip_time)

0 commit comments

Comments
 (0)