diff --git a/Cargo.lock b/Cargo.lock index 612405e..41de096 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,16 +101,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "async-channel" version = "1.8.0" @@ -265,7 +255,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-attributes", "async-channel", "async-global-executor", "async-io", @@ -1836,6 +1825,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "once_cell" version = "1.17.1" @@ -2575,7 +2574,6 @@ dependencies = [ name = "skynet_ldap_backend" version = "0.1.0" dependencies = [ - "async-std", "chrono", "dotenvy", "ldap3", @@ -2586,6 +2584,7 @@ dependencies = [ "sqlx", "ssh-key", "tide", + "tokio", "wolves_oxidised", ] @@ -3161,7 +3160,10 @@ dependencies = [ "bytes", "libc", "mio", + "num_cpus", + "parking_lot", "pin-project-lite 0.2.9", + "signal-hook-registry", "socket2 0.4.9", "tokio-macros", "windows-sys 0.48.0", diff --git a/Cargo.toml b/Cargo.toml index 33582a2..a1462af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ dotenvy = "0.15.7" # For tide tide = "0.16.0" -async-std = { version = "1.12.0", features = ["attributes"] } +tokio = { version = "1", features = ["macros", "rt-multi-thread", "full"] } serde = { version = "1.0", features = ["derive"] } # For sqlite diff --git a/src/bin/update_data.rs b/src/bin/update_data.rs index 70f8af7..af03643 100644 --- a/src/bin/update_data.rs +++ b/src/bin/update_data.rs @@ -3,7 +3,7 @@ use skynet_ldap_backend::{db_init, get_config, AccountWolves, Accounts, Config}; use sqlx::{Pool, Sqlite}; use wolves_oxidised::WolvesUser; -#[async_std::main] +#[tokio::main] async fn main() -> tide::Result<()> { let config = get_config(); let db = db_init(&config).await.unwrap(); diff --git a/src/bin/update_groups.rs b/src/bin/update_groups.rs index 2009998..4501f77 100644 --- a/src/bin/update_groups.rs +++ b/src/bin/update_groups.rs @@ -2,7 +2,7 @@ use skynet_ldap_backend::{db_init, get_config, get_now_iso, get_wolves, update_g use sqlx::{Pool, Sqlite}; use std::{collections::HashSet, env, error::Error}; -#[async_std::main] +#[tokio::main] async fn main() -> tide::Result<()> { let config = get_config(); diff --git a/src/main.rs b/src/main.rs index 1bf849c..3cd1284 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,7 @@ use tide::{ security::{CorsMiddleware, Origin}, }; -#[async_std::main] +#[tokio::main] async fn main() -> tide::Result<()> { let config = get_config(); let db = db_init(&config).await?;