From 585cb237cf51356b5d0e554cd35f8eb39d89b490 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Thu, 11 Jul 2024 08:06:36 +0100
Subject: [PATCH] refactor: split ReceiveServerConfig handler

First handler, with original name, validates the server config.

The new second handler, ReceiveValidServerConfig, can then (re)start the
server without needing to validate the settings.
---
 crates/server-actor/src/lib.rs | 59 +++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/crates/server-actor/src/lib.rs b/crates/server-actor/src/lib.rs
index 15dcb0d..fe8cca5 100644
--- a/crates/server-actor/src/lib.rs
+++ b/crates/server-actor/src/lib.rs
@@ -1,5 +1,6 @@
 //
 use actix::prelude::*;
+use derive_more::Constructor;
 use git_next_actor_macros::message;
 use git_next_config as config;
 use git_next_config::server::{ServerConfig, ServerStorage, Webhook};
@@ -9,18 +10,27 @@ use git_next_git::{Generation, RepoDetails};
 use git_next_repo_actor::{messages::CloneRepo, RepoActor};
 use git_next_webhook_actor as webhook;
 use kxio::{fs::FileSystem, network::Network};
-use std::path::PathBuf;
-use tracing::{error, info, warn};
+use std::{net::SocketAddr, path::PathBuf};
+use tracing::{error, info};
 use webhook::{AddWebhookRecipient, ShutdownWebhook, WebhookActor, WebhookRouter};
 
 pub use git_next_git::repository::{factory::real as repository_factory, RepositoryFactory};
 
 message!(ReceiveServerConfig: ServerConfig: "Notification of newly loaded server configuration.
 
+
 This message will prompt the `git-next` server to stop and restart all repo-actors.
 
 Contains the new server configuration.");
 
+#[derive(Clone, Debug, PartialEq, Eq, Constructor)]
+pub struct ValidServerConfig {
+    server_config: ServerConfig,
+    socket_address: SocketAddr,
+    server_storage: ServerStorage,
+}
+message!(ReceiveValidServerConfig: ValidServerConfig: "Notification of validated server configuration.");
+
 #[derive(Debug, derive_more::Display, derive_more::From)]
 pub enum Error {
     #[display("Failed to create data directories")]
@@ -65,28 +75,45 @@ impl Handler<FileUpdated> for Server {
 impl Handler<ReceiveServerConfig> for Server {
     type Result = ();
 
-    fn handle(&mut self, msg: ReceiveServerConfig, _ctx: &mut Self::Context) -> Self::Result {
+    fn handle(&mut self, msg: ReceiveServerConfig, ctx: &mut Self::Context) -> Self::Result {
         let Ok(socket_addr) = msg.http() else {
-            warn!("Unable to parse http.addr");
+            error!("Unable to parse http.addr");
             return;
         };
+
+        let Some(server_storage) = self.server_storage(&msg) else {
+            error!("Server storage not available");
+            return;
+        };
+
+        ctx.address()
+            .do_send(ReceiveValidServerConfig::new(ValidServerConfig::new(
+                msg.0,
+                socket_addr,
+                server_storage,
+            )));
+    }
+}
+impl Handler<ReceiveValidServerConfig> for Server {
+    type Result = ();
+
+    fn handle(&mut self, msg: ReceiveValidServerConfig, _ctx: &mut Self::Context) -> Self::Result {
+        let ValidServerConfig {
+            server_config,
+            socket_address,
+            server_storage,
+        } = msg.0;
         if let Some(webhook) = self.webhook.take() {
             webhook.do_send(ShutdownWebhook);
         }
         self.generation.inc();
-        let server_config = msg;
-        let Some(server_storage) = self.server_storage(&server_config) else {
-            return;
-        };
-
         // Webhook Server
         info!("Starting Webhook Server...");
         let webhook_router = WebhookRouter::default().start();
         let webhook = server_config.webhook();
-
         // Forge Actors
         for (forge_alias, forge_config) in server_config.forges() {
-            self.create_forge_repos(forge_config, forge_alias.clone(), server_storage, webhook)
+            self.create_forge_repos(forge_config, forge_alias.clone(), &server_storage, webhook)
                 .into_iter()
                 .map(|a| self.start_actor(a))
                 .map(|(repo_alias, addr)| {
@@ -94,8 +121,7 @@ impl Handler<ReceiveServerConfig> for Server {
                 })
                 .for_each(|msg| webhook_router.do_send(msg));
         }
-
-        let webhook = WebhookActor::new(socket_addr, webhook_router.recipient()).start();
+        let webhook = WebhookActor::new(socket_address, webhook_router.recipient()).start();
         self.webhook.replace(webhook);
     }
 }
@@ -229,11 +255,8 @@ impl Server {
         (repo_alias, addr)
     }
 
-    fn server_storage<'cfg>(
-        &self,
-        server_config: &'cfg ReceiveServerConfig,
-    ) -> Option<&'cfg ServerStorage> {
-        let server_storage = server_config.storage();
+    fn server_storage(&self, server_config: &ReceiveServerConfig) -> Option<ServerStorage> {
+        let server_storage = server_config.storage().clone();
         let dir = server_storage.path();
         if !dir.exists() {
             if let Err(err) = self.fs.dir_create(dir) {