Externalise Consul module to df-consul crate

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main.rs b/src/main.rs
index 79c4a9b..c97bddf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,7 +13,6 @@ use tokio::sync::watch;
 
 mod cert;
 mod cert_store;
-mod consul;
 mod http;
 mod https;
 mod metrics;
@@ -21,6 +20,7 @@ mod proxy_config;
 mod reverse_proxy;
 mod tls_util;
 
+pub use df_consul as consul;
 use proxy_config::ProxyConfig;
 
 #[cfg(feature = "dhat-heap")]
@@ -139,13 +139,17 @@ async fn main() {
 		client_key: opt.consul_client_key.clone(),
 	};
 
-	let consul = consul::Consul::new(consul_config, &opt.consul_kv_prefix, &opt.node_name)
+	let consul = consul::Consul::new(consul_config, &opt.consul_kv_prefix)
 		.expect("Error creating Consul client");
-	let rx_proxy_config =
-		proxy_config::spawn_proxy_config_task(consul.clone(), exit_signal.clone());
+	let rx_proxy_config = proxy_config::spawn_proxy_config_task(
+		consul.clone(),
+		opt.node_name.clone(),
+		exit_signal.clone(),
+	);
 
 	let cert_store = cert_store::CertStore::new(
 		consul.clone(),
+		opt.node_name.clone(),
 		rx_proxy_config.clone(),
 		opt.letsencrypt_email.clone(),
 		exit_on_err.clone(),