Projects/mysqladm-rs
Projects
/
mysqladm-rs
12
2
Fork 0
Code Issues 36 Pull Requests Releases Activity

Bump all deps, fix db connection closing issues #59

Merged
oysteikt merged 1 commits from fix-db-conn-close into main 2024-08-18 01:33:56 +02:00
Conversation 0 Commits 1 Files Changed 3 +401 -338
3 changed files with 401 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8d9237143 - Show all commits

706
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

24
Cargo.toml
View File

@ -4,30 +4,30 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
anyhow = "1.0.82" anyhow = "1.0.86"
async-bincode = "0.7.2" async-bincode = "0.7.2"
bincode = "1.3.3" bincode = "1.3.3"
clap = { version = "4.5.4", features = ["derive"] } clap = { version = "4.5.16", features = ["derive"] }
derive_more = { version = "1.0.0", features = ["display", "error"] } derive_more = { version = "1.0.0", features = ["display", "error"] }
dialoguer = "0.11.0" dialoguer = "0.11.0"
env_logger = "0.11.3" env_logger = "0.11.5"
futures = "0.3.30" futures = "0.3.30"
futures-util = "0.3.30" futures-util = "0.3.30"
indoc = "2.0.5" indoc = "2.0.5"
itertools = "0.12.1" itertools = "0.13.0"
log = "0.4.21" log = "0.4.22"
nix = { version = "0.28.0", features = ["fs", "process", "user"] } nix = { version = "0.29.0", features = ["fs", "process", "user"] }
prettytable = "0.10.0" prettytable = "0.10.0"
rand = "0.8.5" rand = "0.8.5"
ratatui = { version = "0.26.2", optional = true } ratatui = { version = "0.28.0", optional = true }
serde = "1.0.198" serde = "1.0.208"
serde_json = { version = "1.0.116", features = ["preserve_order"] } serde_json = { version = "1.0.125", features = ["preserve_order"] }
sqlx = { version = "0.7.4", features = ["runtime-tokio", "mysql", "tls-rustls"] } sqlx = { version = "0.8.0", features = ["runtime-tokio", "mysql", "tls-rustls"] }
tokio = { version = "1.37.0", features = ["rt", "macros"] } tokio = { version = "1.39.3", features = ["rt", "macros"] }
tokio-serde = { version = "0.9.0", features = ["bincode"] } tokio-serde = { version = "0.9.0", features = ["bincode"] }
tokio-stream = "0.1.15" tokio-stream = "0.1.15"
tokio-util = { version = "0.7.11", features = ["codec"] } tokio-util = { version = "0.7.11", features = ["codec"] }
toml = "0.8.12" toml = "0.8.19"
uuid = { version = "1.10.0", features = ["v4"] } uuid = { version = "1.10.0", features = ["v4"] }
[features] [features]

9
src/server/server_loop.rs
View File

@ -1,7 +1,5 @@
use std::{collections::BTreeSet, fs, path::PathBuf}; use std::{collections::BTreeSet, fs, path::PathBuf};
use anyhow::Context;
use futures_util::{SinkExt, StreamExt}; use futures_util::{SinkExt, StreamExt};
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
use tokio::net::{UnixListener, UnixStream}; use tokio::net::{UnixListener, UnixStream};
@ -102,11 +100,8 @@ pub async fn handle_requests_for_single_session(
) )
.await; .await;
if let Err(e) = db_connection if let Err(e) = db_connection.close().await {
.close() eprintln!("Failed to close database connection: {}", e);
.await
.context("Failed to close connection properly")
{
eprintln!("{}", e); eprintln!("{}", e);
eprintln!("Ignoring..."); eprintln!("Ignoring...");
} }