Projects/mysqladm-rs
12
2
Fork 0
Code Issues 44 Pull Requests Actions Packages Releases Activity

Use multithreaded tokio runtime for external server
Some checks failed
Build / check (push) Failing after 5m19s
Details
Build / build (push) Successful in 13m21s
Details
Build / docs (push) Successful in 18m22s
Details

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-11-10 01:27:52 +09:00
parent f90e60d856
commit d932b57aaa
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@@ -631,7 +631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -1052,7 +1052,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
dependencies = [ dependencies = [
"hermit-abi", "hermit-abi",
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -1713,7 +1713,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.11.0", "linux-raw-sys 0.11.0",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -2249,7 +2249,7 @@ dependencies = [
"getrandom 0.3.4", "getrandom 0.3.4",
"once_cell", "once_cell",
"rustix 1.1.2", "rustix 1.1.2",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]

2
Cargo.toml
View File

@@ -40,7 +40,7 @@ serde = "1.0.228"
serde_json = { version = "1.0.145", features = ["preserve_order"] } serde_json = { version = "1.0.145", features = ["preserve_order"] }
sqlx = { version = "0.8.6", features = ["runtime-tokio", "mysql", "tls-rustls"] } sqlx = { version = "0.8.6", features = ["runtime-tokio", "mysql", "tls-rustls"] }
systemd-journal-logger = "2.2.2" systemd-journal-logger = "2.2.2"
tokio = { version = "1.48.0", features = ["rt", "macros"] } tokio = { version = "1.48.0", features = ["rt-multi-thread", "macros"] }
tokio-serde = { version = "0.9.0", features = ["bincode"] } tokio-serde = { version = "0.9.0", features = ["bincode"] }
tokio-stream = "0.1.17" tokio-stream = "0.1.17"
tokio-util = { version = "0.7.17", features = ["codec"] } tokio-util = { version = "0.7.17", features = ["codec"] }

7
src/main.rs
View File

@@ -1,6 +1,7 @@
#[macro_use] #[macro_use]
extern crate prettytable; extern crate prettytable;
use anyhow::Context;
use clap::{CommandFactory, Parser, ValueEnum}; use clap::{CommandFactory, Parser, ValueEnum};
use clap_complete::{Shell, generate}; use clap_complete::{Shell, generate};
use clap_verbosity_flag::Verbosity; use clap_verbosity_flag::Verbosity;
@@ -204,10 +205,10 @@ fn tokio_start_server(
verbosity: Verbosity, verbosity: Verbosity,
args: ServerArgs, args: ServerArgs,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
tokio::runtime::Builder::new_current_thread() tokio::runtime::Builder::new_multi_thread()
.enable_all() .enable_all()
.build() .build()
.unwrap() .context("Failed to start Tokio runtime")?
.block_on(async { .block_on(async {
server::command::handle_command(server_socket_path, config_path, verbosity, args).await server::command::handle_command(server_socket_path, config_path, verbosity, args).await
}) })
@@ -217,7 +218,7 @@ fn tokio_run_command(command: Command, server_connection: StdUnixStream) -> anyh
tokio::runtime::Builder::new_current_thread() tokio::runtime::Builder::new_current_thread()
.enable_all() .enable_all()
.build() .build()
.unwrap() .context("Failed to start Tokio runtime")?
.block_on(async { .block_on(async {
let tokio_socket = TokioUnixStream::from_std(server_connection)?; let tokio_socket = TokioUnixStream::from_std(server_connection)?;
let mut message_stream = create_client_to_server_message_stream(tokio_socket); let mut message_stream = create_client_to_server_message_stream(tokio_socket);