From c311313ecb80e07f33aeabfdcb025b76542f46ea Mon Sep 17 00:00:00 2001 From: timvisee Date: Sat, 16 Mar 2024 12:50:32 +0100 Subject: [PATCH] Improve error handling when reading server favicon --- src/status.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/status.rs b/src/status.rs index 54bf985..0ec8477 100644 --- a/src/status.rs +++ b/src/status.rs @@ -281,15 +281,10 @@ async fn server_favicon(config: &Config) -> String { } // Read icon data - let data = match fs::read(path).await.map_err(|err| { - error!(target: "lazymc", "Failed to read favicon from {}: {}", SERVER_ICON_FILE, err); - }) { - Ok(data) => data, - Err(err) => { - error!(target: "lazymc::status", "Failed to load server icon from disk, using default: {:?}", err); - return favicon::default_favicon(); - } - }; + let data = fs::read(path).await.unwrap_or_else(|err| { + error!(target: "lazymc::status", "Failed to read favicon from {}, using default: {err}", SERVER_ICON_FILE); + favicon::default_favicon().into_bytes() + }); favicon::encode_favicon(&data) }