early return

railwayapp · Nov 27, 2023 · 5e19c27 · 5e19c27
1 parent 95332b9
commit 5e19c27
Showing 1 changed file with 44 additions and 43 deletions.
diff --git a/src/util/logs.rs b/src/util/logs.rs
@@ -2,49 +2,50 @@ use crate::subscriptions;
 use colored::Colorize;
 
 pub fn format_attr_log(log: subscriptions::deployment_logs::LogFields) {
-    if !log.attributes.is_empty() {
-        let mut level: Option<String> = None;
-        let message = log.message;
-        let mut others = Vec::new();
-        // get attributes using a match
-        for attr in &log.attributes {
-            match attr.key.to_lowercase().as_str() {
-                "level" | "lvl" | "severity" => level = Some(attr.value.clone()),
-                _ => others.push(format!(
-                    "{}{}{}",
-                    attr.key.clone().magenta(),
-                    "=",
-                    attr.value
-                        .clone()
-                        .normal()
-                        .replace('"', "\"".dimmed().to_string().as_str())
-                )),
-            }
-        }
-        // get the level and colour it
-        let level = level
-            .map(|level| {
-                // make it uppercase so we dont have to make another variable
-                // for some reason, .uppercase() removes formatting
-
-                match level.replace('"', "").to_lowercase().as_str() {
-                    "info" => "[INFO]".blue(),
-                    "error" | "err" => "[ERRO]".red(),
-                    "warn" => "[WARN]".yellow(),
-                    "debug" => "[DBUG]".dimmed(),
-                    _ => format!("[{}]", level).normal(),
-                }
-                .bold()
-            })
-            .unwrap();
-        println!(
-            "{} {} {} {}",
-            log.timestamp.replace('"', "").normal(),
-            level,
-            message,
-            others.join(" ")
-        );
-    } else {
+    if log.attributes.is_empty() {
         println!("{}", log.message);
+        return;
+    }
+
+    let mut level: Option<String> = None;
+    let message = log.message;
+    let mut others = Vec::new();
+    // get attributes using a match
+    for attr in &log.attributes {
+        match attr.key.to_lowercase().as_str() {
+            "level" | "lvl" | "severity" => level = Some(attr.value.clone()),
+            _ => others.push(format!(
+                "{}{}{}",
+                attr.key.clone().magenta(),
+                "=",
+                attr.value
+                    .clone()
+                    .normal()
+                    .replace('"', "\"".dimmed().to_string().as_str())
+            )),
+        }
     }
+    // get the level and colour it
+    let level = level
+        .map(|level| {
+            // make it uppercase so we dont have to make another variable
+            // for some reason, .uppercase() removes formatting
+
+            match level.replace('"', "").to_lowercase().as_str() {
+                "info" => "[INFO]".blue(),
+                "error" | "err" => "[ERRO]".red(),
+                "warn" => "[WARN]".yellow(),
+                "debug" => "[DBUG]".dimmed(),
+                _ => format!("[{}]", level).normal(),
+            }
+            .bold()
+        })
+        .unwrap();
+    println!(
+        "{} {} {} {}",
+        log.timestamp.replace('"', "").normal(),
+        level,
+        message,
+        others.join(" ")
+    );
 }