Skip to content

vtl2_settings_worker: additional tracing #2147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

vtl2_settings_worker: additional tracing #2147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a9690
vtl2_settings_worker: additional tracing
mattkur Oct 10, 2025
4251a33
Merge branch 'main' into vtl2-more-logs
mattkur Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions openhcl/underhill_core/src/dispatch/vtl2_settings_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,22 +286,25 @@ impl Vtl2SettingsWorker {
fixed: Default::default(),
dynamic: self.old_settings.clone(),
};
let vtl2_settings =
Vtl2Settings::read_from(buf, old_settings).map_err(|err| match err {
underhill_config::schema::ParseError::Json(err) => {
vec![Vtl2SettingsErrorInfo::new(
Vtl2SettingsErrorCode::JsonFormatError,
err.to_string(),
)]
}
underhill_config::schema::ParseError::Protobuf(err) => {
vec![Vtl2SettingsErrorInfo::new(
Vtl2SettingsErrorCode::ProtobufFormatError,
err.to_string(),
)]
}
underhill_config::schema::ParseError::Validation(err) => err.errors,
})?;
let vtl2_settings = Vtl2Settings::read_from(buf, old_settings).map_err(|err| match err {
underhill_config::schema::ParseError::Json(err) => {
vec![Vtl2SettingsErrorInfo::new(
Vtl2SettingsErrorCode::JsonFormatError,
err.to_string(),
)]
}
underhill_config::schema::ParseError::Protobuf(err) => {
vec![Vtl2SettingsErrorInfo::new(
Vtl2SettingsErrorCode::ProtobufFormatError,
err.to_string(),
)]
}
underhill_config::schema::ParseError::Validation(err) => err.errors,
});

tracing::trace!(CVM_ALLOWED, ?buf, ?vtl2_settings, "VTL2 settings received");

let vtl2_settings = vtl2_settings?;

let new_settings = vtl2_settings.dynamic;

Expand All @@ -319,6 +322,11 @@ impl Vtl2SettingsWorker {
}

if !errors.is_empty() {
tracing::warn!(
CVM_ALLOWED,
?errors,
"Errors preparing VTL2 configuration changes"
);
return Err(errors);
}

Expand Down Expand Up @@ -353,6 +361,11 @@ impl Vtl2SettingsWorker {
}

if !errors.is_empty() {
tracing::warn!(
CVM_ALLOWED,
?errors,
"Errors applying VTL2 configuration changes"
);
return Err(errors);
}

Expand Down