X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=src%2Fmain.rs;h=f9d8f4ed2a37bf33f46c53f74a35b4a56d75ad22;hb=e45d8f67336160ae61a9dc24f899752f5199a01b;hp=79b22623a0f6396d7b53cc05f944bb36e92f86c7;hpb=14192169c496bbd090f85a7e308817e6e6027aed;p=gandi_dns_update.git

diff --git a/src/main.rs b/src/main.rs
index 79b2262..f9d8f4e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,10 @@
 /*
  * API Reference: https://api.gandi.net/docs/livedns/
+ *
  * Some similar implementations:
  * - https://github.com/rmarchant/gandi-ddns/blob/master/gandi_ddns.py
  * - https://github.com/brianhp2/gandi-automatic-dns
  *
- * TODO:
- * - Log to stdout with (at least) timestamps.
- * - Renew function.
  */
 
 #![cfg_attr(debug_assertions, allow(unused_variables, unused_imports, dead_code))]
@@ -23,8 +21,7 @@ use crate::config::Config;
 const FILE_CONF: &str = "config.ron";
 
 fn main() -> Result<()> {
-
-    println!("GANDI DynDNS");
+    println!("=== GANDI LiveDNS updater ===");
 
     let config = Config::read(FILE_CONF)?;
 
@@ -33,8 +30,8 @@ fn main() -> Result<()> {
     loop {
         let time_beginning_loop = time::Instant::now();
 
-        if let Err(err) = check_and_update_dns(&config.api_key, &config.fqdn, &config.domains, config.ttl) {
-            println!("!! Error: {}", err);
+        if let Err(err) = check_and_update_dns(&config.api_key, &config.domains, config.ttl) {
+            println!("!! {}", err);
         }
 
         let elapsed = time::Instant::now() - time_beginning_loop;
@@ -46,15 +43,15 @@ fn main() -> Result<()> {
     }
 }
 
-fn check_and_update_dns(api_key: &str, fqdn: &str, domains: &Vec<String>, ttl: i32) -> Result<()> {
+fn check_and_update_dns(api_key: &str, domains: &Vec<(String, String)>, ttl: i32) -> Result<()> {
     let real_ip = get_real_ip()?;
 
-    for domain in domains {
-        let current_ip = get_current_record_ip(api_key, domain, fqdn)?;
+    for (hostname, domain) in domains {
+        let current_ip = get_current_record_ip(api_key, hostname, domain)?;
 
         if real_ip != current_ip {
             println!("IP addresses don't match for domain {}: real = {}, dns = {}. Renewing DNS...", domain, real_ip, current_ip);
-            update_record_ip(api_key, domain, fqdn, real_ip, ttl)?;
+            update_record_ip(api_key, hostname, domain, real_ip, ttl)?;
             println!("Renewing of {} successfully", domain);
         }
     }
@@ -75,11 +72,11 @@ fn get_real_ip() -> Result<Ipv4Addr> {
                     _ => Err(Box::new(Error { message: String::from("Can't parse IPv4 from ipify") }))
                 }
             } else {
-                Err(Box::new(Error { message: format!("Request unsuccessful: {:#?}", resp) }))
+                Err(Box::new(Error { message: format!("Request unsuccessful to {}: {:#?}", url, resp) }))
             },
 
         Err(error) => {
-            Err(Box::new(Error { message: format!("Error during request: {:?}", error) }))
+            Err(Box::new(Error { message: format!("Error during request to {}: {:?}", url, error) }))
         }
     }
 }
@@ -122,8 +119,8 @@ fn request_livedns_gandi(api_key: &str, url_fragment: &str, method: Method) -> R
 
     let request_builder =
         match method {
-            Method::Put(body) => client.put(url).body(body),
-            Method::Get => client.get(url)
+            Method::Put(body) => client.put(&url).body(body),
+            Method::Get => client.get(&url)
         };
 
     match request_builder.header("Authorization", format!("Apikey {}", api_key)).send() {
@@ -132,9 +129,9 @@ fn request_livedns_gandi(api_key: &str, url_fragment: &str, method: Method) -> R
                 let content = resp.text().unwrap();
                 Ok(serde_json::from_str(&content).unwrap())
             } else {
-                Err(Box::new(Error { message: format!("Request unsuccessful: {:#?}", resp) }))
+                Err(Box::new(Error { message: format!("Request unsuccessful to {}: {:#?}", &url, resp) }))
             },
         Err(error) =>
-            Err(Box::new(Error { message: format!("Error during request: {:?}", error) }))
+            Err(Box::new(Error { message: format!("Error during request to {}: {:?}", &url, error) }))
     }
 }