solve: close #3

sctg-development · Jul 4, 2024 · 64fee8d · 64fee8d
1 parent 32bfc32
commit 64fee8d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -62,7 +62,7 @@ local-ip-address = "0.5.1"
 dns-lookup = "1.0.8"
 ping = "0.4.0"
 sctgdesk-api-server = { git = "https://github.com/sctg-development/sctgdesk-api-server.git", branch = "main" }
-# sctgdesk-api-server = { path = "../sctgdesk-api-server" }
+
 rocket = { version = "0.5", features = ["json", "secrets"] }
 
 [build-dependencies]

diff --git a/db_v2.sqlite3 b/db_v2.sqlite3
diff --git a/src/main.rs b/src/main.rs
@@ -88,6 +88,13 @@ fn main() -> ResultType<()> {
     let serial: i32 = get_arg("serial").parse().unwrap_or(0);
 
     std::env::set_var("MAIN_PKG_VERSION", env!("CARGO_PKG_VERSION"));
+    let handle = thread::spawn(|| {
+        let rt = rocket::tokio::runtime::Runtime::new().unwrap();
+        rt.block_on(async {
+            let _ = sctgdesk_api_server::ApiState::new_with_db("db_v2.sqlite3").await;
+        });
+    });
+    handle.join().unwrap();
     let rocket_thread = thread::spawn(|| {
         let _ = start_rocket();
     });