logging system update0.2.2

3 files changed, 13 insertions, 20 deletions

diff --git a/Cargo.lock b/Cargo.lock
index a5911ad..3f03784 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -593,8 +593,8 @@ dependencies = [
 
 [[package]]
 name = "rsdsl_dhcp4d"
-version = "0.1.4"
-source = "git+https://github.com/rsdsl/dhcp4d.git#a80da8a06374c9ca0e360607dcd80615287bb0e9"
+version = "0.1.5"
+source = "git+https://github.com/rsdsl/dhcp4d.git#1280344c62a32e490690067a619389c2a2b2c12d"
 dependencies = [
  "dhcproto",
  "ipnet",
@@ -611,7 +611,7 @@ dependencies = [
 
 [[package]]
 name = "rsdsl_dnsd"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "byteorder",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index bdbe056..2749197 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rsdsl_dnsd"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,7 +10,7 @@ byteorder = "1.4.3"
 bytes = "1.4.0"
 dns-message-parser = "0.7.0"
 notify = "5.1.0"
-rsdsl_dhcp4d = { git = "https://github.com/rsdsl/dhcp4d.git", version = "0.1.4" }
+rsdsl_dhcp4d = { git = "https://github.com/rsdsl/dhcp4d.git", version = "0.1.5" }
 rsdsl_he_config = { git = "https://github.com/rsdsl/he_config.git", version = "0.1.0" }
 serde_json = "1.0"
 thiserror = "1.0"
diff --git a/src/main.rs b/src/main.rs
index 2df4e55..53b8ac8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,7 +36,7 @@ fn refresh_leases(cache: Arc<RwLock<Vec<Lease>>>) -> Result<()> {
                 }
             }
         }
-        Err(e) => println!("[dnsd] watch error: {:?}", e),
+        Err(e) => println!("watch error: {:?}", e),
     })?;
 
     watcher.watch(Path::new("/data"), RecursiveMode::Recursive)?;
@@ -66,11 +66,7 @@ fn read_leases(cache: Arc<RwLock<Vec<Lease>>>) -> Result<()> {
         let mut net_leases: Vec<Lease> = match serde_json::from_reader(&file) {
             Ok(v) => v,
             Err(e) => {
-                println!(
-                    "[dnsd] ignore broken lease file {}: {}",
-                    entry.path().display(),
-                    e
-                );
+                println!("ignore broken lease file {}: {}", entry.path().display(), e);
 
                 continue;
             }
@@ -84,7 +80,7 @@ fn read_leases(cache: Arc<RwLock<Vec<Lease>>>) -> Result<()> {
 }
 
 fn main() -> Result<()> {
-    println!("[dnsd] init");
+    println!("init");
 
     let mut file = File::open("/data/he6in4.conf")?;
     let he: Config = serde_json::from_reader(&mut file)?;
@@ -122,7 +118,7 @@ fn main() -> Result<()> {
         };
 
         if !is_local {
-            println!("[dnsd] drop wan pkt from {}", raddr);
+            println!("drop wan pkt from {}", raddr);
             continue;
         }
 
@@ -131,7 +127,7 @@ fn main() -> Result<()> {
         let leases3 = leases.clone();
         thread::spawn(move || match handle_query(sock2, &buf, raddr, leases3) {
             Ok(_) => {}
-            Err(e) => println!("[dnsd] can't handle query from {}: {}", raddr, e),
+            Err(e) => println!("can't handle query from {}: {}", raddr, e),
         });
     }
 }
@@ -152,10 +148,7 @@ fn handle_query(
             match is_dhcp_known(q.domain_name.to_string(), leases.clone()) {
                 Ok(known) => known,
                 Err(e) => {
-                    println!(
-                        "[dnsd] can't read dhcp config, ignoring {}: {}",
-                        q.domain_name, e
-                    );
+                    println!("can't read dhcp config, ignoring {}: {}", q.domain_name, e);
                     false
                 }
             }
@@ -184,7 +177,7 @@ fn handle_query(
                 ipv4_addr: lease.address,
             });
 
-            println!("[dnsd] {} dhcp {}", raddr, answer);
+            println!("{} dhcp {}", raddr, answer);
             Some(answer)
         } else {
             None
@@ -220,7 +213,7 @@ fn handle_query(
         resp_additionals = resp.additionals;
 
         for answer in &resp_answers {
-            println!("[dnsd] {} fwrd {}", raddr, answer);
+            println!("{} fwrd {}", raddr, answer);
         }
     }