v0.1.3-pre.004

This commit is contained in:
2026-08-15 19:58:18 +02:00
parent 0629a48e97
commit 29660fd9f0
13 changed files with 1134 additions and 174 deletions

View File

@@ -1,5 +1,5 @@
// file: crates/ksp-logging-lib/src/runtime.rs
// version: 8
// version: 9
use tracing_subscriber::Layer; // rust-rules: trait-import
use tracing_subscriber::layer::SubscriberExt; // rust-rules: trait-import
@@ -165,17 +165,27 @@ fn prepare_runtime(settings: &crate::LoggingSettings) -> ksp_core_lib::Result<Pr
if let std::option::Option::Some(error) = validation_error {
return std::result::Result::Err(error);
}
if settings.console().is_none() && settings.file().is_none() {
let runtime_validation = validate_current_runtime_capabilities(settings);
if let std::result::Result::Err(error) = runtime_validation {
return std::result::Result::Err(error);
}
let enabled_console = settings.console().filter(|console| -> bool {
return console.enabled();
});
let enabled_file = settings.files().iter().find(|file| -> bool {
return file.enabled();
});
if enabled_console.is_none() && enabled_file.is_none() {
return std::result::Result::Ok(PreparedRuntime { layers: RuntimeLayers::new(), outputs: RuntimeOutputs::default() });
}
let prepared_file = match settings.file() {
let prepared_file = match enabled_file {
std::option::Option::Some(file) => match build_file_output(file, settings) {
std::result::Result::Ok(output) => std::option::Option::Some(output),
std::result::Result::Err(error) => return std::result::Result::Err(error),
},
std::option::Option::None => std::option::Option::None,
};
let prepared_console = settings.console().map(|console| -> PreparedOutput {
let prepared_console = enabled_console.map(|console| -> PreparedOutput {
return build_console_output(console, settings);
});
let mut output_layers = RuntimeLayers::new();
@@ -193,6 +203,37 @@ fn prepare_runtime(settings: &crate::LoggingSettings) -> ksp_core_lib::Result<Pr
return std::result::Result::Ok(PreparedRuntime { layers, outputs });
}
fn validate_current_runtime_capabilities(settings: &crate::LoggingSettings) -> ksp_core_lib::Result<()> {
let enabled_file_count = settings
.files()
.iter()
.filter(|file| -> bool {
return file.enabled();
})
.count();
if enabled_file_count > 1 {
return runtime_capability_error("multiple enabled file outputs require the multi-sink runtime");
}
if let std::option::Option::Some(console) = settings.console()
&& console.enabled()
&& (console.ansi() || console.format() != crate::LogFormat::Human || !console.filter().is_unrestricted())
{
return runtime_capability_error("console ANSI, selectable formats and per-output routing require the multi-sink runtime");
}
for file in settings.files() {
if file.enabled() && (file.format() != crate::LogFormat::Human || !file.filter().is_unrestricted()) {
return runtime_capability_error("file formats and per-output routing require the multi-sink runtime");
}
}
return std::result::Result::Ok(());
}
fn runtime_capability_error(message: &str) -> ksp_core_lib::Result<()> {
return std::result::Result::Err(
ksp_core_lib::Error::new(crate::ERROR_CODE_INVALID_SETTINGS, message).with_context("runtime_contract", "single-output-compatibility"),
);
}
fn build_console_output(console: &crate::ConsoleSettings, settings: &crate::LoggingSettings) -> PreparedOutput {
return match console.output() {
crate::ConsoleOutput::Stdout => build_non_blocking_output(std::io::stdout(), "ksp-logging-console", settings, true),