diff --git a/wire/agent/src/main.rs b/wire/agent/src/main.rs index 4891977..bb2946b 100644 --- a/wire/agent/src/main.rs +++ b/wire/agent/src/main.rs @@ -2,10 +2,10 @@ // Copyright 2024-2025 wire Contributors #![deny(clippy::pedantic)] +use agent::keys::KeySpec; use base64::Engine; use base64::prelude::BASE64_STANDARD; use futures_util::stream::StreamExt; -use agent::keys::KeySpec; use nix::unistd::{Group, User}; use prost::Message; use prost::bytes::Bytes; diff --git a/wire/lib/src/errors.rs b/wire/lib/src/errors.rs index 0830c56..52e6d81 100644 --- a/wire/lib/src/errors.rs +++ b/wire/lib/src/errors.rs @@ -94,7 +94,7 @@ pub enum ActivationError { )] #[error("failed to touch /var/lib/wire-rollback/heartbeat on node {name}")] FailedHeartbeatError { - name: Name, + name: Name, #[source] activation_failure: CommandError, diff --git a/wire/lib/src/hive/steps/activate.rs b/wire/lib/src/hive/steps/activate.rs index c7b7f3d..3ae1208 100644 --- a/wire/lib/src/hive/steps/activate.rs +++ b/wire/lib/src/hive/steps/activate.rs @@ -116,7 +116,11 @@ async fn reboot(ctx: &Context<'_>) -> Result<(), HiveLibError> { )); } -async fn rollback(ctx: &Context<'_>, goal: &SwitchToConfigurationGoal, original_error: CommandError) -> Result<(), HiveLibError> { +async fn rollback( + ctx: &Context<'_>, + goal: &SwitchToConfigurationGoal, + original_error: CommandError, +) -> Result<(), HiveLibError> { let command_string = "touch /var/lib/wire-rollback/heartbeat".to_string(); let child = run_command( @@ -135,9 +139,9 @@ async fn rollback(ctx: &Context<'_>, goal: &SwitchToConfigurationGoal, original_ )), Err(err) => Err(HiveLibError::ActivationError( ActivationError::FailedHeartbeatError { - name: ctx.name.clone(), + name: ctx.name.clone(), activation_failure: original_error, - related_errors: vec![err] + related_errors: vec![err], }, )), }