Skip to content
This repository was archived by the owner on Dec 5, 2025. It is now read-only.

Make consulrs less chatty by reducing info! to debug! #17

Open
justinmir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make consulrs less chatty by reducing info! to debug! #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pub async fn exec_with_empty<E>(
where
E: Endpoint<Response = ()> + FeaturedEndpoint,
{
info!("Executing {} and expecting no response", endpoint.path());
debug!("Executing {} and expecting no response", endpoint.path());
let features = endpoint.features();
endpoint
.with_middleware(&client.middle(features))
Expand All @@ -136,7 +136,7 @@ pub async fn exec_with_raw<E>(
where
E: Endpoint + FeaturedEndpoint,
{
info!("Executing {} and expecting a response", endpoint.path());
debug!("Executing {} and expecting a response", endpoint.path());
let features = endpoint.features();
endpoint
.with_middleware(&client.middle(features))
Expand All @@ -161,7 +161,7 @@ pub async fn exec_with_result<E>(
where
E: Endpoint + FeaturedEndpoint,
{
info!("Executing {} and expecting a response", endpoint.path());
debug!("Executing {} and expecting a response", endpoint.path());
let features = endpoint.features();
endpoint
.with_middleware(&client.middle(features))
Expand Down
4 changes: 2 additions & 2 deletions src/api/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl Features {
pub fn process(&self, request: &mut Request<Vec<u8>>) {
let mut query = HashMap::<String, String>::new();
let mut keys = Vec::<String>::new();
info!("Adding features to request");
debug!("Adding features to request");

// Blocking Queries
if let Some(b) = &self.blocking {
Expand Down Expand Up @@ -97,7 +97,7 @@ impl Features {

*request.uri_mut() = http::Uri::from_str(url.as_str()).unwrap();

info!("Final url with features: {}", request.uri());
debug!("Final url with features: {}", request.uri());
}

/// Returns a default instance of [FeaturesBuilder] for configuring features.
Expand Down
22 changes: 11 additions & 11 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ impl ConsulClient {
}
})?;

info!("Importing CA certificate from {}", path);
debug!("Importing CA certificate from {}", path);
http_client = http_client.add_root_certificate(cert);
}

Expand All @@ -100,7 +100,7 @@ impl ConsulClient {
}
})?;

info!("Importing client certificate from {}", cert);
debug!("Importing client certificate from {}", cert);
http_client = http_client.identity(id);
}

Expand Down Expand Up @@ -152,11 +152,11 @@ impl ConsulClientSettingsBuilder {
fn default_address(&self) -> String {
match env::var("CONSUL_HTTP_ADDR") {
Ok(s) => {
info!("Using consul address from $CONSUL_HTTP_ADDR");
debug!("Using consul address from $CONSUL_HTTP_ADDR");
s
}
Err(_) => {
info!("Using default consul address http://127.0.0.1:8500");
debug!("Using default consul address http://127.0.0.1:8500");
String::from("http://127.0.0.1:8500")
}
}
Expand All @@ -166,12 +166,12 @@ impl ConsulClientSettingsBuilder {
let mut paths: Vec<String> = Vec::new();

if let Ok(s) = env::var("CONSUL_CACERT") {
info!("Found CA certificate in $CONSUL_CACERT");
debug!("Found CA certificate in $CONSUL_CACERT");
paths.push(s);
}

if let Ok(s) = env::var("CONSUL_CAPATH") {
info!("Found CA certificate path in $CONSUL_CAPATH");
debug!("Found CA certificate path in $CONSUL_CAPATH");
if let Ok(p) = fs::read_dir(s) {
for path in p {
paths.push(path.unwrap().path().to_str().unwrap().to_string())
Expand All @@ -185,7 +185,7 @@ impl ConsulClientSettingsBuilder {
fn default_client_cert(&self) -> Option<String> {
match env::var("CONSUL_CLIENT_CERT") {
Ok(s) => {
info!("Using TLS client certificate from $CONSUL_CLIENT_CERT");
debug!("Using TLS client certificate from $CONSUL_CLIENT_CERT");
Some(s)
}
Err(_) => {
Expand All @@ -198,7 +198,7 @@ impl ConsulClientSettingsBuilder {
fn default_client_key(&self) -> Option<String> {
match env::var("CONSUL_CLIENT_KEY") {
Ok(s) => {
info!("Using TLS client key from $CONSUL_CLIENT_KEY");
debug!("Using TLS client key from $CONSUL_CLIENT_KEY");
Some(s)
}
Err(_) => {
Expand All @@ -211,18 +211,18 @@ impl ConsulClientSettingsBuilder {
fn default_token(&self) -> Option<String> {
match env::var("CONSUL_HTTP_TOKEN") {
Ok(s) => {
info!("Using consul ACL token from $CONSUL_HTTP_TOKEN");
debug!("Using consul ACL token from $CONSUL_HTTP_TOKEN");
Some(s)
}
Err(_) => {
info!("Using default empty consul ACL token");
debug!("Using default empty consul ACL token");
None
}
}
}

fn default_verify(&self) -> bool {
info!("Checking TLS verification using $CONSUL_HTTP_SSL_VERIFY");
debug!("Checking TLS verification using $CONSUL_HTTP_SSL_VERIFY");
let verify = env::var("CONSUL_HTTP_SSL_VERIFY").unwrap_or_else(|_| "true".into());
match verify.as_str() {
"true" => true,
Expand Down