From b7aa417831431c2fc835583daa2817d10056c9d4 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Thu, 9 May 2024 20:39:04 +0100
Subject: [PATCH] feat(server): include repo in missing handler logs

Closes kemitix/git-next#78
---
 src/server/actors/repo/mod.rs       | 10 +++++-----
 src/server/actors/server.rs         |  1 -
 src/server/actors/webhook/router.rs |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/server/actors/repo/mod.rs b/src/server/actors/repo/mod.rs
index 72d0a29..202a04f 100644
--- a/src/server/actors/repo/mod.rs
+++ b/src/server/actors/repo/mod.rs
@@ -62,7 +62,7 @@ impl RepoActor {
 }
 impl Actor for RepoActor {
     type Context = Context<Self>;
-    #[tracing::instrument(name = "RepoActor::stopping", skip_all)]
+    #[tracing::instrument(name = "RepoActor::stopping", skip_all, fields(repo = %self.details))]
     fn stopping(&mut self, ctx: &mut Self::Context) -> Running {
         info!("Checking webhook");
         match self.webhook_id.take() {
@@ -95,7 +95,7 @@ impl std::fmt::Display for RepoActor {
 pub struct CloneRepo;
 impl Handler<CloneRepo> for RepoActor {
     type Result = ();
-    #[tracing::instrument(name = "RepoActor::CloneRepo", skip_all, fields(repo = %self, gitdir = %self.details.gitdir))]
+    #[tracing::instrument(name = "RepoActor::CloneRepo", skip_all, fields(repo = %self.details, gitdir = %self.details.gitdir))]
     fn handle(&mut self, _msg: CloneRepo, ctx: &mut Self::Context) -> Self::Result {
         info!("Message Received");
         let gitdir = self.details.gitdir.clone();
@@ -119,7 +119,7 @@ impl Handler<CloneRepo> for RepoActor {
 pub struct LoadConfigFromRepo;
 impl Handler<LoadConfigFromRepo> for RepoActor {
     type Result = ();
-    #[tracing::instrument(name = "RepoActor::LoadConfigFromRepo", skip_all, fields(repo = %self))]
+    #[tracing::instrument(name = "RepoActor::LoadConfigFromRepo", skip_all, fields(repo = %self.details))]
     fn handle(&mut self, _msg: LoadConfigFromRepo, ctx: &mut Self::Context) -> Self::Result {
         info!("Message Received");
         let details = self.details.clone();
@@ -255,7 +255,7 @@ impl Handler<StartMonitoring> for RepoActor {
 pub struct WebhookRegistered(pub WebhookId, pub WebhookAuth);
 impl Handler<WebhookRegistered> for RepoActor {
     type Result = ();
-    #[tracing::instrument(name = "RepoActor::WebhookRegistered", skip_all, fields(webhook_id = %msg.0))]
+    #[tracing::instrument(name = "RepoActor::WebhookRegistered", skip_all, fields(repo = %self.details, webhook_id = %msg.0))]
     fn handle(&mut self, msg: WebhookRegistered, _ctx: &mut Self::Context) -> Self::Result {
         info!("Message Received");
         self.webhook_id.replace(msg.0);
@@ -268,7 +268,7 @@ impl Handler<WebhookRegistered> for RepoActor {
 pub struct AdvanceMainTo(pub gitforge::Commit);
 impl Handler<AdvanceMainTo> for RepoActor {
     type Result = ();
-    #[tracing::instrument(name = "RepoActor::AdvanceMainTo", skip_all, fields(commit = %msg.0))]
+    #[tracing::instrument(name = "RepoActor::AdvanceMainTo", skip_all, fields(repo = %self.details, commit = %msg.0))]
     fn handle(&mut self, msg: AdvanceMainTo, ctx: &mut Self::Context) -> Self::Result {
         info!("Message Received");
         let Some(repo_config) = self.details.repo_config.clone() else {
diff --git a/src/server/actors/server.rs b/src/server/actors/server.rs
index 819c532..bf82962 100644
--- a/src/server/actors/server.rs
+++ b/src/server/actors/server.rs
@@ -212,7 +212,6 @@ impl Server {
         let (forge_name, repo_alias, actor) = actor;
         let span = tracing::info_span!("start_actor", forge = %forge_name, repo = %repo_alias);
         let _guard = span.enter();
-        info!("Starting");
         let addr = actor.start();
         addr.do_send(CloneRepo);
         info!("Started");
diff --git a/src/server/actors/webhook/router.rs b/src/server/actors/webhook/router.rs
index 9fc169d..79fb65f 100644
--- a/src/server/actors/webhook/router.rs
+++ b/src/server/actors/webhook/router.rs
@@ -30,7 +30,7 @@ impl Handler<WebhookMessage> for WebhookRouter {
         let repo_alias = RepoAlias(msg.path().clone());
         debug!(repo = %repo_alias, "Router...");
         if let Some(recipient) = self.repos.get(&repo_alias) {
-            info!("Sending to Recipient");
+            info!(repo = %repo_alias, "Sending to Recipient");
             recipient.do_send(msg);
         }
     }