diff --git a/src/acme.rs b/src/acme.rs index d913676..c60656e 100644 --- a/src/acme.rs +++ b/src/acme.rs @@ -107,15 +107,15 @@ pub fn request_acme_certificate(acme_request: AcmeRequest, dns_cleaned_domains: information!("Clearing domain: {}", &rr_and_domain.1); dns_cleaned_domains.push(rr_and_domain.1.clone()); dns_client.as_mut().map(|client| { - match client.list_dns(&rr_and_domain.1) { + match client.list_dns_records(&rr_and_domain.1) { Err(e) => warning!("List dns for: {}, failed: {}", &rr_and_domain.1, e), Ok(records) => { for r in &records { let rr = &r.rr; if rr == "_acme-challenge" || rr.starts_with("_acme-challenge.") { match client.delete_dns_record(&r.id) { - Err(e) => warning!("Delete dns: {}.{}, failed: {}", r.rr, r.domain, e), - Ok(_) => success!("Delete dns: {}.{}", r.rr, r.domain), + Err(e) => warning!("Delete dns: {}.{}, failed: {}", rr, r.domain, e), + Ok(_) => success!("Delete dns: {}.{}", rr, r.domain), } } } diff --git a/src/ali_dns.rs b/src/ali_dns.rs index df5dcc5..80a25a1 100644 --- a/src/ali_dns.rs +++ b/src/ali_dns.rs @@ -20,7 +20,7 @@ impl AlibabaCloudDnsClient { } impl DnsClient for AlibabaCloudDnsClient { - fn list_dns(&mut self, domain: &str) -> XResult> { + fn list_dns_records(&mut self, domain: &str) -> XResult> { let list_dns_response = opt_result!(list_dns(&self.client, domain)?, "List dns records failed: {:?}"); let mut dns_records = vec![]; list_dns_response.domain_records.record.into_iter().for_each(|record| { diff --git a/src/dns.rs b/src/dns.rs index cab6882..1e50d5c 100644 --- a/src/dns.rs +++ b/src/dns.rs @@ -13,7 +13,7 @@ pub struct DnsRecord { } pub trait DnsClient { - fn list_dns(&mut self, domain: &str) -> XResult>; + fn list_dns_records(&mut self, domain: &str) -> XResult>; fn delete_dns_record(&mut self, record_id: &str) -> XResult<()>;