Fixed logging (#626)

runtime/src/dotnet.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use base64::Engine;
 use base64::prelude::BASE64_STANDARD;
-use log::{debug, error, info, warn};
+use log::{error, info, warn};
 use once_cell::sync::Lazy;
 use rocket::get;
 use tauri::api::process::{Command, CommandChild, CommandEvent};
@@ -101,43 +101,11 @@ pub fn start_dotnet_server() {
         *server_spawn_clone.lock().unwrap() = Some(child);
 
         // Log the output of the .NET server:
+        // NOTE: Log events are sent via structured HTTP API calls.
+        // This loop serves for fundamental output (e.g., startup errors).
         while let Some(CommandEvent::Stdout(line)) = rx.recv().await {
-
-            // Remove newline characters from the end:
             let line = line.trim_end();
-
-            // Starts the line with '=>'?
-            if line.starts_with("=>") {
-                // Yes. This means that the line is a log message from the .NET server.
-                // The format is: '<YYYY-MM-dd HH:mm:ss.fff> [<log level>] <source>: <message>'.
-                // We try to parse this line and log it with the correct log level:
-                let line = line.trim_start_matches("=>").trim();
-                let parts = line.split_once(": ").unwrap();
-                let left_part = parts.0.trim();
-                let message = parts.1.trim();
-                let parts = left_part.split_once("] ").unwrap();
-                let level = parts.0.split_once("[").unwrap().1.trim();
-                let source = parts.1.trim();
-                match level {
-                    "Trace" => debug!(Source = ".NET Server", Comp = source; "{message}"),
-                    "Debug" => debug!(Source = ".NET Server", Comp = source; "{message}"),
-                    "Information" => info!(Source = ".NET Server", Comp = source; "{message}"),
-                    "Warning" => warn!(Source = ".NET Server", Comp = source; "{message}"),
-                    "Error" => error!(Source = ".NET Server", Comp = source; "{message}"),
-                    "Critical" => error!(Source = ".NET Server", Comp = source; "{message}"),
-
-                    _ => error!(Source = ".NET Server", Comp = source; "{message} (unknown log level '{level}')"),
-                }
-            } else {
-                let lower_line = line.to_lowercase();
-                if lower_line.contains("error") {
-                    error!(Source = ".NET Server"; "{line}");
-                } else if lower_line.contains("warning") {
-                    warn!(Source = ".NET Server"; "{line}");
-                } else {
-                    info!(Source = ".NET Server"; "{line}");
-                }
-            }
+            info!(Source = ".NET Server (stdout)"; "{line}");
         }
     });
 }

runtime/src/log.rs

@@ -6,11 +6,11 @@ use std::path::{absolute, PathBuf};
 use std::sync::OnceLock;
 use flexi_logger::{DeferredNow, Duplicate, FileSpec, Logger, LoggerHandle};
 use flexi_logger::writers::FileLogWriter;
-use log::kv;
+use log::{kv, Level};
 use log::kv::{Key, Value, VisitSource};
-use rocket::get;
+use rocket::{get, post};
 use rocket::serde::json::Json;
-use rocket::serde::Serialize;
+use rocket::serde::{Deserialize, Serialize};
 use crate::api_token::APIToken;
 use crate::environment::is_dev;
 
@@ -65,6 +65,7 @@ pub fn init_logging() {
         .duplicate_to_stdout(Duplicate::All)
         .use_utc()
         .format_for_files(file_logger_format)
+        .set_palette("196;208;34;7;8".to_string()) // error, warn, info, debug, trace
         .format_for_stderr(terminal_colored_logger_format)
         .format_for_stdout(terminal_colored_logger_format)
         .start().expect("Cannot start logging");
@@ -231,9 +232,88 @@ pub async fn get_log_paths(_token: APIToken) -> Json<LogPathsResponse> {
     })
 }
 
+/// Converts a .NET log level string to a Rust log::Level.
+fn parse_dotnet_log_level(level: &str) -> Level {
+    match level {
+        "Trace" | "Debug" => Level::Debug,
+        "Information" => Level::Info,
+        "Warning" => Level::Warn,
+        "Error" | "Critical" => Level::Error,
+
+        _ => Level::Error, // Fallback for unknown levels
+    }
+}
+
+/// Logs a message with the specified level, including optional exception and stack trace.
+fn log_with_level(
+    level: Level,
+    category: &str,
+    message: &str,
+    exception: Option<&String>,
+    stack_trace: Option<&String>
+) {
+    // Log the main message:
+    log::log!(level, Source = ".NET Server", Comp = category; "{message}");
+
+    // Log exception if present:
+    if let Some(ex) = exception {
+        log::log!(level, Source = ".NET Server", Comp = category; "  Exception: {ex}");
+    }
+
+    // Log stack trace if present:
+    if let Some(stack_trace) = stack_trace {
+        for line in stack_trace.lines() {
+            log::log!(level, Source = ".NET Server", Comp = category; "    {line}");
+        }
+    }
+}
+
+/// Logs an event from the .NET server.
+#[post("/log/event", data = "<event>")]
+pub fn log_event(_token: APIToken, event: Json<LogEvent>) -> Json<LogEventResponse> {
+    let event = event.into_inner();
+    let level = parse_dotnet_log_level(&event.level);
+    let message = event.message.as_str();
+    let category = event.category.as_str();
+
+    log_with_level(
+        level,
+        category,
+        message,
+        event.exception.as_ref(),
+        event.stack_trace.as_ref()
+    );
+
+    // Log warning for unknown levels:
+    if !matches!(event.level.as_str(), "Trace" | "Debug" | "Information" | "Warning" | "Error" | "Critical") {
+        log::warn!(Source = ".NET Server", Comp = category; "Unknown log level '{}' received.", event.level);
+    }
+
+    Json(LogEventResponse { success: true, issue: String::new() })
+}
+
 /// The response the get log paths request.
 #[derive(Serialize)]
 pub struct LogPathsResponse {
     log_startup_path: String,
     log_app_path: String,
+}
+
+/// A log event from the .NET server.
+#[derive(Deserialize)]
+#[allow(unused)]
+pub struct LogEvent {
+    timestamp: String,
+    level: String,
+    category: String,
+    message: String,
+    exception: Option<String>,
+    stack_trace: Option<String>,
+}
+
+/// The response to a log event request.
+#[derive(Serialize)]
+pub struct LogEventResponse {
+    success: bool,
+    issue: String,
 }

runtime/src/runtime_api.rs

@@ -86,6 +86,7 @@ pub fn start_runtime_api() {
                 crate::environment::read_enterprise_env_config_server_url,
                 crate::file_data::extract_data,
                 crate::log::get_log_paths,
+                crate::log::log_event,
             ])
             .ignite().await.unwrap()
             .launch().await.unwrap();