From 1d8db7811dd688b94b9b3187599da02a810c2d0e Mon Sep 17 00:00:00 2001 From: Li Chaoran Date: Thu, 6 Jul 2023 19:35:24 +0800 Subject: [PATCH] fix some compile warnings Signed-off-by: Li Chaoran --- src/client_entrypoint.rs | 5 ++--- src/control_admin_entrypoint.rs | 2 -- src/util/config.rs | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/client_entrypoint.rs b/src/client_entrypoint.rs index 7b427fd..0ce7f47 100644 --- a/src/client_entrypoint.rs +++ b/src/client_entrypoint.rs @@ -60,9 +60,8 @@ fn main() -> Result<()> { let app = App::parse(); let path = app.config.unwrap_or( format!("{}/{}", env::current_dir().expect("current dir not found").display(), "client.toml")); - let mut client = Config::default(); - client - .merge(File::with_name(path.as_str())).expect("load client configuration file"); + let client = Config::builder().add_source(File::with_name(path.as_str())).build().expect("load client configuration file"); + let signal = Arc::new(AtomicBool::new(false)); signal_hook::flag::register(signal_hook::consts::SIGTERM, Arc::clone(&signal)).expect("failed to register sigterm signal"); signal_hook::flag::register(signal_hook::consts::SIGINT, Arc::clone(&signal)).expect("failed to register sigint signal"); diff --git a/src/control_admin_entrypoint.rs b/src/control_admin_entrypoint.rs index 4ab080e..d2fb9c5 100644 --- a/src/control_admin_entrypoint.rs +++ b/src/control_admin_entrypoint.rs @@ -41,8 +41,6 @@ mod presentation; #[macro_use] extern crate log; -#[macro_use] -extern crate lazy_static; #[derive(Parser)] #[command(name = "signatrust-admin")] diff --git a/src/util/config.rs b/src/util/config.rs index b703c04..12b5b71 100644 --- a/src/util/config.rs +++ b/src/util/config.rs @@ -69,7 +69,8 @@ impl ServerConfig { .. })) => { info!("server configuration changed ..."); - config.write().unwrap().refresh().expect("failed to write configuration file"); + let mut conf = config.write().unwrap(); + *conf = Config::builder().add_source(File::with_name(watch_file.as_str())).build_cloned().expect("reloading from configuration file"); } Some(Err(e)) => error!("watch error: {:?}", e), _ => {} -- Gitee