diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-10-18 21:17:11 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-10-18 21:17:11 +0200 |
| commit | 8bc5caf7aa9bc0e27b741c68113cb7fdde2d54e6 (patch) | |
| tree | bf5b64bd594972a6827ee3a6eacf5e58710c0d12 /src | |
| parent | 2da8786f54dcf13bed51549f818a1af3bbebaa8c (diff) | |
| download | garage-8bc5caf7aa9bc0e27b741c68113cb7fdde2d54e6.tar.gz garage-8bc5caf7aa9bc0e27b741c68113cb7fdde2d54e6.zip | |
Fix issue with 'http(s)://' prefixconsul-tls
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/consul.rs | 6 | ||||
| -rw-r--r-- | src/util/config.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rpc/consul.rs b/src/rpc/consul.rs index cf050207..b1772a1a 100644 --- a/src/rpc/consul.rs +++ b/src/rpc/consul.rs @@ -100,8 +100,8 @@ impl ConsulDiscovery { pub async fn get_consul_nodes(&self) -> Result<Vec<(NodeID, SocketAddr)>, ConsulError> { let url = format!( - "http://{}/v1/catalog/service/{}", - self.config.consul_host, self.config.service_name + "{}/v1/catalog/service/{}", + self.config.consul_http_addr, self.config.service_name ); let http = self.client.get(&url).send().await?; @@ -158,7 +158,7 @@ impl ConsulDiscovery { }, }; - let url = format!("http://{}/v1/catalog/register", self.config.consul_host); + let url = format!("{}/v1/catalog/register", self.config.consul_http_addr); let http = self.client.put(&url).json(&advertisement).send().await?; http.error_for_status()?; diff --git a/src/util/config.rs b/src/util/config.rs index a85e025f..04f8375a 100644 --- a/src/util/config.rs +++ b/src/util/config.rs @@ -128,8 +128,8 @@ pub struct AdminConfig { #[derive(Deserialize, Debug, Clone)] pub struct ConsulDiscoveryConfig { - /// Consul host to connect to to discover more peers - pub consul_host: String, + /// Consul http or https address to connect to to discover more peers + pub consul_http_addr: String, /// Consul service name to use pub service_name: String, /// CA TLS certificate to use when connecting to Consul |