From 7dab1da44b9ad3d4ebfcee2241425e5fa78c0e13 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 11 Apr 2024 07:15:19 +0100 Subject: [PATCH] fix(server): reduce complexity of StartMonitoring handler Closes kemitix/git-next#25 --- src/server/actors/repo/mod.rs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/server/actors/repo/mod.rs b/src/server/actors/repo/mod.rs index 6f57a3b..c9c3b06 100644 --- a/src/server/actors/repo/mod.rs +++ b/src/server/actors/repo/mod.rs @@ -90,33 +90,25 @@ pub struct StartMonitoring { } impl Handler for RepoActor { type Result = (); - #[allow(clippy::cognitive_complexity)] // TODO: (#25) this function is complex fn handle(&mut self, msg: StartMonitoring, ctx: &mut Self::Context) -> Self::Result { - info!("Monitoring started"); let Some(repo_config) = self.config.clone() else { warn!("No config loaded"); return; }; + let next_ahead_of_main = msg.main != msg.next; + let dev_ahead_of_next = msg.next != msg.dev; + info!(%msg.main, %msg.next, %msg.dev, next_ahead_of_main, dev_ahead_of_next, "StartMonitoring"); + let repo_details = self.details.clone(); let addr = ctx.address(); let net = self.net.clone(); - info!(%msg.main, %msg.next, %msg.dev, "Checking positions"); - let next_ahead_of_main = msg.main != msg.next; - let dev_ahead_of_next = msg.next != msg.dev; - info!( - ?next_ahead_of_main, - ?dev_ahead_of_next, - "Checking positions" - ); if next_ahead_of_main { - info!("Next is ahead of main"); status::check_next(msg.next, repo_details, addr, net) .into_actor(self) .wait(ctx); } else if dev_ahead_of_next { - info!("Dev is ahead of next"); branch::advance_next( msg.next, msg.dev_commit_history, @@ -127,7 +119,6 @@ impl Handler for RepoActor { .into_actor(self) .wait(ctx); } else if self.webhook_id.is_none() { - info!("No webhook registered"); webhook::register(repo_details, addr, net) .into_actor(self) .wait(ctx)