Improve error handling when reading server favicon

timvisee · Mar 16, 2024 · c311313 · c311313
1 parent 6e6d098
commit c311313
Showing 1 changed file with 4 additions and 9 deletions.
diff --git 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)
 }