refactor: use env_logger

Mufanc · Feb 7, 2024 · b0e8c0c · b0e8c0c
1 parent 15c2151
commit b0e8c0c
Show file tree

Hide file tree

Showing 5 changed files with 253 additions and 31 deletions.
diff --git a/daemon/Cargo.lock b/daemon/Cargo.lock
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
@@ -15,7 +15,9 @@ path = "src/daemon.rs"
 [dependencies]
 anyhow = "1.0.75"
 ctor = "0.2.5"
+env_logger = "0.11"
 goblin = "0.7.1"
+log = "0.4"
 nix = { version = "0.27.1", features = ["socket", "process", "signal"] }
 once_cell = "1.19.0"
 tokio = { version = "1", features = ["full"] }

diff --git a/daemon/src/configs.rs b/daemon/src/configs.rs
@@ -2,16 +2,15 @@ use std::env;
 use nix::unistd::getpid;
 use crate::configs::Operation::OpenLink;
 
-const DAEMON_ADDRESS_ENV: &str = "QWRAPPER_DAEMON";
-const DAEMON_ADDRESS_PREFIX: &str = "qwrapper-daemon-";
+pub const DAEMON_ADDRESS_ENV: &str = "QWRAPPER_DAEMON";
+pub const DAEMON_ADDRESS_PREFIX: &str = "qwrapper-daemon-";
 
 
 pub fn server_address() -> String {
     if let Ok(addr) = env::var(DAEMON_ADDRESS_ENV) {
         addr
     } else {
-        env::set_var(DAEMON_ADDRESS_ENV, format!("{}{}", DAEMON_ADDRESS_PREFIX, getpid()));
-        server_address()
+        format!("{}{}", DAEMON_ADDRESS_PREFIX, getpid())
     }
 }