From fe792da0a4bc6ac072f6241fdf4666edbfbaf827 Mon Sep 17 00:00:00 2001 From: jiangliuwei Date: Wed, 4 Dec 2024 14:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9apiserver=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=AF=E5=8A=A8=E5=8F=82=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/nanocld/src/apiserver/apiserver.rs | 10 +++++++--- bin/nanocld/src/system/init.rs | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/nanocld/src/apiserver/apiserver.rs b/bin/nanocld/src/apiserver/apiserver.rs index 67b4828b..a4e4b214 100644 --- a/bin/nanocld/src/apiserver/apiserver.rs +++ b/bin/nanocld/src/apiserver/apiserver.rs @@ -1,12 +1,16 @@ use ntex::rt; use std::time; -pub fn start_apiserver() { +use crate::models::SystemState; + +pub fn start_apiserver(state: SystemState) { rt::Arbiter::new().exec_fn(move || { rt::spawn(async move { loop { - let database_url = "sqlite://./database.sqlite"; + + let sqlite_addr= state.inner.config.store_addr.as_ref().unwrap().clone(); + // let database_url = "sqlite://./database.sqlite"; let address = "0.0.0.0:8080"; - if let Err(e) = fleet_apiserver::start_server(database_url, address).await + if let Err(e) = fleet_apiserver::start_server(sqlite_addr.as_str(), address).await { eprintln!("Error starting server: {}", e); } diff --git a/bin/nanocld/src/system/init.rs b/bin/nanocld/src/system/init.rs index cbebadbd..89e8acff 100644 --- a/bin/nanocld/src/system/init.rs +++ b/bin/nanocld/src/system/init.rs @@ -178,7 +178,7 @@ pub async fn init(conf: &DaemonConfig) -> IoResult { // Ok::<_, IoError>(()) // }); eventbus::eventbus::analyze(system_state_cl); - apiserver::apiserver::start_apiserver(); + apiserver::apiserver::start_apiserver(system_ptr); // super::metric::spawn(&system_state); Ok(system_state) -- Gitee