Merge pull request #1658 from stevenengler/fix-errors-before-log-init

stevenengler · web-flow · commit 62862625f575 · 2021-09-21T15:20:10.000-04:00
Improve error messages before logger is initialized
diff --git a/src/main/core/main.rs b/src/main/core/main.rs
@@ -243,14 +243,18 @@ mod export {
 
         if let Err(e) = result {
             // log the full error, its context, and its backtrace if enabled
-            for line in format!("{:?}", e).split("\n") {
-                log::error!("{}", line);
+            if log::log_enabled!(log::Level::Error) {
+                for line in format!("{:?}", e).split("\n") {
+                    log::error!("{}", line);
+                }
+                log::logger().flush();
+
+                // print the short error
+                eprintln!("** Shadow did not complete successfully: {}", e);
+                eprintln!("** See the log for details");
+            } else {
+                eprintln!("{:?}", e);
             }
-            log::logger().flush();
-
-            // print the short error
-            eprintln!("** Shadow did not complete successfully: {}", e);
-            eprintln!("** See the log for details");
 
             return 1;
         }
