Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
c4f3c129f1
|
|||
|
64b2f04f8f
|
|||
|
940b595e3a
|
|||
|
46a886a6bd
|
|||
|
3791a8b04e
|
|||
|
9ba7ac5c70
|
131
Cargo.lock
generated
131
Cargo.lock
generated
@ -250,9 +250,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.5.0"
|
||||
version = "1.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
|
||||
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
@ -262,15 +262,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.11.1"
|
||||
version = "2.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
||||
checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.12.0"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
|
||||
checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
|
||||
dependencies = [
|
||||
"hybrid-array",
|
||||
"zeroize",
|
||||
@ -334,9 +334,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.20.2"
|
||||
version = "3.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
|
||||
checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
@ -355,9 +355,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.63"
|
||||
version = "1.2.64"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
|
||||
checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"jobserver",
|
||||
@ -373,9 +373,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.44"
|
||||
version = "0.4.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
|
||||
checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
|
||||
dependencies = [
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
@ -554,15 +554,12 @@ name = "deranged"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
|
||||
dependencies = [
|
||||
"powerfmt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "diesel"
|
||||
version = "2.3.9"
|
||||
version = "2.3.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9940fb8467a0a06312218ed384185cb8536aa10d8ec017d0ce7fad2c1bd882d5"
|
||||
checksum = "29fe29a87fb84c631ffb3ba21798c4b1f3a964701ba78f0dce4bf8668562ec88"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"diesel_derives",
|
||||
@ -632,9 +629,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "displaydoc"
|
||||
version = "0.2.5"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
|
||||
checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -643,7 +640,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dockermcmgr"
|
||||
version = "0.0.6"
|
||||
version = "0.0.9"
|
||||
dependencies = [
|
||||
"async-process",
|
||||
"async-std",
|
||||
@ -944,9 +941,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "http"
|
||||
version = "1.4.0"
|
||||
version = "1.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
|
||||
checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"itoa",
|
||||
@ -998,9 +995,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.9.0"
|
||||
version = "1.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
|
||||
checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
|
||||
dependencies = [
|
||||
"atomic-waker",
|
||||
"bytes",
|
||||
@ -1251,13 +1248,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.98"
|
||||
version = "0.3.102"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
|
||||
checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
@ -1327,9 +1323,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.29"
|
||||
version = "0.4.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
|
||||
checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
|
||||
dependencies = [
|
||||
"value-bag",
|
||||
]
|
||||
@ -1345,9 +1341,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.8.0"
|
||||
version = "2.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
|
||||
|
||||
[[package]]
|
||||
name = "migrations_internals"
|
||||
@ -1382,9 +1378,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "1.2.0"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
|
||||
checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi",
|
||||
@ -1600,9 +1596,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.12.3"
|
||||
version = "1.12.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
|
||||
checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@ -1623,9 +1619,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.10"
|
||||
version = "0.8.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
|
||||
checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
|
||||
|
||||
[[package]]
|
||||
name = "rsqlite-vfs"
|
||||
@ -1715,9 +1711,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.149"
|
||||
version = "1.0.150"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
||||
checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
@ -1810,15 +1806,15 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.15.1"
|
||||
version = "1.15.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||
checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
|
||||
checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys",
|
||||
@ -1903,12 +1899,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.47"
|
||||
version = "0.3.49"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
|
||||
checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"js-sys",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
@ -1919,15 +1914,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.8"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
|
||||
checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.27"
|
||||
version = "0.2.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
|
||||
checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
@ -1945,9 +1940,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.52.1"
|
||||
version = "1.52.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
|
||||
checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"libc",
|
||||
@ -2122,9 +2117,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
||||
|
||||
[[package]]
|
||||
name = "wasip2"
|
||||
version = "1.0.3+wasi-0.2.9"
|
||||
version = "1.0.4+wasi-0.2.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
|
||||
checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
|
||||
dependencies = [
|
||||
"wit-bindgen 0.57.1",
|
||||
]
|
||||
@ -2140,9 +2135,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.121"
|
||||
version = "0.2.125"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
|
||||
checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
@ -2153,9 +2148,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.71"
|
||||
version = "0.4.75"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
|
||||
checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
@ -2163,9 +2158,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.121"
|
||||
version = "0.2.125"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
|
||||
checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@ -2173,9 +2168,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.121"
|
||||
version = "0.2.125"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
|
||||
checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
@ -2186,9 +2181,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.121"
|
||||
version = "0.2.125"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
|
||||
checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@ -2431,9 +2426,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
|
||||
|
||||
[[package]]
|
||||
name = "yoke"
|
||||
version = "0.8.2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
|
||||
checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
|
||||
dependencies = [
|
||||
"stable_deref_trait",
|
||||
"yoke-derive",
|
||||
@ -2475,9 +2470,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zeroize"
|
||||
version = "1.8.2"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
|
||||
checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
|
||||
|
||||
[[package]]
|
||||
name = "zerotrie"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "dockermcmgr"
|
||||
version = "0.0.7"
|
||||
version = "0.0.9"
|
||||
edition = "2024"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@ -38,15 +38,12 @@
|
||||
final:
|
||||
{
|
||||
pname = "dmm";
|
||||
version = "0.0.7";
|
||||
version = "0.0.9";
|
||||
|
||||
inherit src;
|
||||
cargoLock.lockFile = src + "/Cargo.lock";
|
||||
nativeBuildInputs = tools;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
# env.COMPRESSION_COMMAND="${pkgs.lrzip}/bin/lrzip";
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
sqlite
|
||||
|
||||
@ -36,7 +36,7 @@ pub async fn subcommand(arguments: &ArgMatches, pool: &DbPool, docker: &Docker)
|
||||
|
||||
if server.status == ServerStatus::Running {
|
||||
println!("Stopping container");
|
||||
srvmgr::stop_server(&docker, pool, server_name).await?;
|
||||
srvmgr::stop_server(&docker, pool, server_name, false).await?;
|
||||
println!("container stopped");
|
||||
}
|
||||
|
||||
|
||||
32
src/cli/disable.rs
Normal file
32
src/cli/disable.rs
Normal file
@ -0,0 +1,32 @@
|
||||
use bollard::Docker;
|
||||
use clap::Arg;
|
||||
use clap::{Command, ArgMatches};
|
||||
|
||||
use crate::DbPool;
|
||||
|
||||
use crate::srvmgr;
|
||||
use crate::status::ServerStatus;
|
||||
|
||||
use diesel::prelude::*;
|
||||
|
||||
use crate::schema;
|
||||
|
||||
pub fn create_subcommand() -> Command {
|
||||
Command::new("disable")
|
||||
.about("disable")
|
||||
.arg(Arg::new("NAME").required(true))
|
||||
}
|
||||
|
||||
pub async fn subcommand(arguments: &ArgMatches, pool: &DbPool, docker: &Docker) -> Result<(), String> {
|
||||
use schema::servers::dsl::*;
|
||||
let server_name = arguments.get_one::<String>("NAME").unwrap();
|
||||
println!("Stopping container");
|
||||
srvmgr::stop_server(&docker, pool, server_name, true).await?;
|
||||
println!("container stopped");
|
||||
|
||||
let conn = &mut pool.get().unwrap();
|
||||
|
||||
diesel::update(servers).filter(name.eq(server_name)).set(status.eq(ServerStatus::Disabled)).execute(conn).map_err(|e| format!("Failed to disable the server : {}", e))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@ -40,7 +40,6 @@ pub async fn subcommand(arguments: &ArgMatches, pool: DbPool) -> Result<(), Stri
|
||||
let prev_env = fs::read_to_string(path.to_string() + "/env").map_err(|e| format!("failed to read previous env file : {}", e))?;
|
||||
|
||||
let new_env = env_settings::update_env(arguments, prev_env);
|
||||
println!("\n\nnew env : {}", new_env);
|
||||
|
||||
|
||||
let mut env_file = fs::OpenOptions::new().write(true).truncate(true).open(path + "/env").map_err(|e| format!("failed to reopen env file : {}" ,e))?;
|
||||
|
||||
@ -6,6 +6,7 @@ pub mod start;
|
||||
pub mod stop;
|
||||
pub mod set_state;
|
||||
pub mod archive;
|
||||
pub mod disable;
|
||||
|
||||
pub mod env_settings;
|
||||
|
||||
|
||||
@ -21,7 +21,8 @@ pub async fn subcommand(arguments: &ArgMatches, pool: &DbPool, docker: &Docker)
|
||||
|
||||
let conn = &mut pool.get().unwrap();
|
||||
|
||||
let _ = srvmgr::stop_server(docker, pool, server_name).await;
|
||||
println!("stopping container if it exists");
|
||||
srvmgr::stop_server(docker, pool, server_name, true).await?;
|
||||
|
||||
let deleted = diesel::delete(servers.filter(name.eq(server_name))).execute(conn).map_err(|_| "failed to delete from db".to_string())?;
|
||||
if deleted != 1 {
|
||||
|
||||
@ -15,7 +15,7 @@ pub fn create_subcommand() -> Command {
|
||||
pub async fn subcommand(arguments: &ArgMatches, pool: &DbPool, docker: &Docker) -> Result<(), String> {
|
||||
let server_name = arguments.get_one::<String>("NAME").unwrap();
|
||||
println!("Stopping container");
|
||||
srvmgr::stop_server(&docker, pool, server_name).await?;
|
||||
srvmgr::stop_server(&docker, pool, server_name, false).await?;
|
||||
println!("container stopped");
|
||||
|
||||
Ok(())
|
||||
|
||||
@ -8,7 +8,7 @@ pub struct Config {
|
||||
impl Config {
|
||||
pub fn load() -> Self {
|
||||
Self {
|
||||
config_path: env::var("DMM_CONFIG_PATH").unwrap_or_else(|_| "/raid/mc_servers".to_string()),
|
||||
config_path: env::var("DMM_CONFIG_PATH").unwrap_or_else(|_| "/raid/crit/mc_servers".to_string()),
|
||||
docker_image: "itzg/minecraft-server".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2026/05/29 21:22:17 by tomoron #+# #+# */
|
||||
/* Updated: 2026/06/12 18:32:19 by tomoron ### ########.fr */
|
||||
/* Updated: 2026/06/17 17:21:44 by tomoron ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -36,6 +36,9 @@ use bollard::Docker;
|
||||
|
||||
mod migrations;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
fn get_connection_pool() -> DbPool {
|
||||
let database_url = "sqlite://".to_string() + &Config::load().config_path + "/db.sqlite";
|
||||
|
||||
@ -64,6 +67,7 @@ fn cli() -> Command {
|
||||
.subcommand(start::create_subcommand())
|
||||
.subcommand(stop::create_subcommand())
|
||||
.subcommand(archive::create_subcommand())
|
||||
.subcommand(disable::create_subcommand())
|
||||
}
|
||||
|
||||
#[tokio::main(flavor = "multi_thread")]
|
||||
@ -86,6 +90,7 @@ async fn main() -> Result<(), String> {
|
||||
Some(("start", sub_matches)) => { start::subcommand(sub_matches, &pool, &docker).await?; },
|
||||
Some(("stop", sub_matches)) => { stop::subcommand(sub_matches, &pool, &docker).await?; },
|
||||
Some(("archive", sub_matches)) => { archive::subcommand(sub_matches, &pool, &docker).await? },
|
||||
Some(("disable", sub_matches)) => { disable::subcommand(sub_matches, &pool, &docker).await? },
|
||||
_ => {panic!("subcommand not implemented")}
|
||||
}
|
||||
Ok(())
|
||||
|
||||
@ -48,7 +48,6 @@ impl Client {
|
||||
return Ok(1);
|
||||
}
|
||||
|
||||
|
||||
match self.out_stream.as_mut().unwrap().try_read(&mut self.read_buf) {
|
||||
Ok(n) => {
|
||||
self.in_stream.write_all(&self.read_buf[..n]).await.map_err(|e| format!("Failed to write to client stream :{}", e))?;
|
||||
@ -70,9 +69,6 @@ impl Client {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
println!("[{}] adding {} bytes to the buffer",self, data.len());
|
||||
|
||||
|
||||
if self.buffer.len() + data.len() > 65536 {
|
||||
return Err("buffer full".to_string());
|
||||
}
|
||||
@ -92,14 +88,11 @@ impl Client {
|
||||
let expected_len = varint_read(&mut varint_buffer)?;
|
||||
let varint_len = varint_buffer_len - varint_buffer.len();
|
||||
|
||||
println!("current len : {}, expected_len : {}", self.buffer.len() -varint_len, expected_len);
|
||||
|
||||
if self.buffer.len() - varint_len < expected_len as usize {
|
||||
break ;
|
||||
}
|
||||
|
||||
println!("buffer : {:?}", self.buffer);
|
||||
|
||||
if self.buffer[0] == 0 {
|
||||
return Err("invalid packet".to_string());
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2026/05/07 17:23:09 by tomoron #+# #+# */
|
||||
/* Updated: 2026/06/11 17:25:09 by tomoron ### ########.fr */
|
||||
/* Updated: 2026/06/13 17:43:46 by tomoron ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -67,7 +67,6 @@ impl Client {
|
||||
|
||||
|
||||
pub async fn get_server(&self) -> Result<Servers, diesel::result::Error> {
|
||||
println!("get server name from domain : {}", self.handshake.as_ref().unwrap().server_address);
|
||||
if let None = self.handshake {
|
||||
panic!("get server called without a handshake");
|
||||
}
|
||||
@ -75,22 +74,18 @@ impl Client {
|
||||
|
||||
let conn = &mut self.db_pool.get().unwrap();
|
||||
|
||||
let reg = Regex::new(r"^(?:([a-zA-Z-_]*)\.)?mc\.tmoron\.fr").unwrap();
|
||||
let reg = Regex::new(r"^(?:([0-9a-zA-Z\-_]*)\.)?mc\.tmoron\.fr").unwrap();
|
||||
let mut found: Option<String> = None;
|
||||
if let Some(capture) = reg.captures(&self.handshake.as_ref().unwrap().server_address) {
|
||||
println!("capture : {:?}", capture);
|
||||
if let Some(captured_str) = capture.get(1) {
|
||||
println!("found valid capture : {}", captured_str.as_str());
|
||||
found = Some(captured_str.as_str().to_string());
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(name) = found {
|
||||
println!("found server name : {}", name);
|
||||
schema::servers::table.filter(schema::servers::name.eq(name)).select(models::Servers::as_select()).first(conn)
|
||||
} else {
|
||||
schema::servers::table.filter(schema::servers::is_default.eq(true)).select(models::Servers::as_select()).first(conn)
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -10,7 +10,6 @@ use tokio::net::TcpStream;
|
||||
|
||||
impl Client {
|
||||
pub async fn handle_packet(&mut self, mut packet: VecDeque<u8>) -> Result<(), String> {
|
||||
println!("packet len : {}", packet.len());
|
||||
let packet_id = varint_read(&mut packet)?;
|
||||
|
||||
|
||||
@ -87,16 +86,14 @@ impl Client {
|
||||
|
||||
let handshake_packet = new_handshake.to_packet();
|
||||
let mut packet = Vec::new();
|
||||
packet.extend(varint_write(handshake_packet.len() as i32));
|
||||
packet.extend(varint_write((handshake_packet.len() + 1) as i32));
|
||||
packet.push(0x00);
|
||||
packet.extend(handshake_packet);
|
||||
|
||||
self.out_stream = Some(stream);
|
||||
|
||||
let _ = self.out_stream.as_ref().unwrap().writable().await;
|
||||
let _ = self.out_stream.as_ref().unwrap().try_write(packet.as_slice());
|
||||
println!("[{}] sent handshake to server", self);
|
||||
|
||||
println!("proxy mode started, buffer len : {}", self.buffer.len());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -31,14 +31,12 @@ impl Client {
|
||||
|
||||
response.append(&mut response_json_len);
|
||||
response.append(&mut response_json.as_bytes().into());
|
||||
println!("[{}] sent status response to client", self);
|
||||
|
||||
self.send_packet(0x0, response).await;
|
||||
} else if packet_id == 1 {
|
||||
let mut response = vec![];
|
||||
response.extend(packet.drain(..));
|
||||
self.send_packet(0x1, response).await;
|
||||
println!("[{}] sent ping response to client", self);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ use std::collections::VecDeque;
|
||||
use std::fmt;
|
||||
use crate::minecraft::varint::{varint_read, varint_write};
|
||||
|
||||
#[derive(Clone)]
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct Handshake {
|
||||
pub protocol_version: i32,
|
||||
pub server_address: String,
|
||||
@ -33,7 +33,6 @@ impl Handshake {
|
||||
|
||||
pub fn to_packet(&self) -> Vec<u8> {
|
||||
let mut packet = Vec::new();
|
||||
packet.extend(varint_write(0));
|
||||
packet.extend(varint_write(self.protocol_version));
|
||||
let address_bytes = self.server_address.as_bytes();
|
||||
packet.extend(varint_write(address_bytes.len() as i32));
|
||||
|
||||
@ -22,6 +22,7 @@ async fn server_init(pool: &DbPool, _docker: &Docker) -> Result<(), String> {
|
||||
.or(status.eq(ServerStatus::Starting))
|
||||
))
|
||||
.set(status.eq(ServerStatus::Stopped)).execute(conn);
|
||||
println!("init done");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -57,7 +58,7 @@ async fn should_stop(docker: &Docker, pool: &DbPool, diff: &TimeDelta, srv: &Ser
|
||||
|
||||
if diff.num_days() >= 7 {
|
||||
println!("last login time exceeded, stopping {}", srv.name);
|
||||
let _ = srvmgr::stop_server(docker, pool, &srv.name).await;
|
||||
let _ = srvmgr::stop_server(docker, pool, &srv.name, false).await;
|
||||
println!("{} stopped", srv.name);
|
||||
}
|
||||
}
|
||||
|
||||
@ -75,11 +75,14 @@ pub async fn start_server(docker: &Docker, pool: &DbPool, server_name: &String)
|
||||
return Err("Server is starting, please wait".to_string());
|
||||
}
|
||||
|
||||
if server.status == ServerStatus::Disabled {
|
||||
return Err("This server is disabled".to_string());
|
||||
}
|
||||
|
||||
if server.status != ServerStatus::Stopped && server.status != ServerStatus::Archived {
|
||||
return Err(format!("Invalid server state ({}), refusing to start", server.status));
|
||||
}
|
||||
|
||||
|
||||
diesel::update(servers).filter(name.eq(server_name)).set(status.eq(ServerStatus::Starting)).execute(conn).map_err(|e| format!("Failed to set server to starting : {}", e))?;
|
||||
|
||||
if server.status == ServerStatus::Archived {
|
||||
|
||||
@ -17,7 +17,7 @@ async fn stop_container(docker: &Docker, name: &String) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn stop_server(docker: &Docker, pool: &DbPool, server_name: &String) -> Result<(), String> {
|
||||
pub async fn stop_server(docker: &Docker, pool: &DbPool, server_name: &String, ignore_stopped: bool) -> Result<(), String> {
|
||||
use schema::servers::dsl::*;
|
||||
|
||||
let conn = &mut pool.get().unwrap();
|
||||
@ -28,6 +28,10 @@ pub async fn stop_server(docker: &Docker, pool: &DbPool, server_name: &String) -
|
||||
Ok(server) => { server }
|
||||
};
|
||||
|
||||
if ignore_stopped && (server.status == ServerStatus::Stopped || server.status == ServerStatus::Archived) {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if server.status != ServerStatus::Running {
|
||||
return Err(format!("Invalid server state ({}), refusing to stop the server", server.status));
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@ pub enum ServerStatus {
|
||||
Starting = 3,
|
||||
Running = 4,
|
||||
Archiving = 5,
|
||||
Disabled = 6,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
@ -42,6 +43,7 @@ impl ToSql<SmallInt, Sqlite> for ServerStatus {
|
||||
impl fmt::Display for ServerStatus {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
let str_status = match self {
|
||||
ServerStatus::Disabled => "disabled",
|
||||
ServerStatus::Archived => "archived",
|
||||
ServerStatus::Archiving => "archiving",
|
||||
ServerStatus::Stopped => "stopped",
|
||||
|
||||
21
src/tests/minecraft/handshake.rs
Normal file
21
src/tests/minecraft/handshake.rs
Normal file
@ -0,0 +1,21 @@
|
||||
use crate::minecraft::handshake::Handshake;
|
||||
|
||||
#[test]
|
||||
fn test_handshake_to_packat_from_packet() {
|
||||
let expected_handshake = Handshake {
|
||||
protocol_version: 775,
|
||||
server_address: "tmoron.fr".to_string(),
|
||||
server_port: 25565,
|
||||
intent: 1
|
||||
};
|
||||
let buffer: Vec<u8> = vec![
|
||||
0x87, 0x06, // varint 775
|
||||
0x09, 0x74, 0x6d, 0x6f, 0x72, 0x6f, 0x6e, 0x2e, 0x66, 0x72, // 9 chars, "tmoron.fr"
|
||||
0x63, 0xdd, // port 25565 (unsigned short)
|
||||
0x01 // varint intent 1
|
||||
];
|
||||
|
||||
let parsed = Handshake::from_packet(&mut buffer.clone().into()).unwrap();
|
||||
assert_eq!(parsed, expected_handshake);
|
||||
assert_eq!(expected_handshake.to_packet(), buffer);
|
||||
}
|
||||
2
src/tests/minecraft/mod.rs
Normal file
2
src/tests/minecraft/mod.rs
Normal file
@ -0,0 +1,2 @@
|
||||
pub mod handshake;
|
||||
pub mod varint;
|
||||
61
src/tests/minecraft/varint.rs
Normal file
61
src/tests/minecraft/varint.rs
Normal file
@ -0,0 +1,61 @@
|
||||
use crate::minecraft::varint::{ varint_read, varint_write };
|
||||
use std::collections::VecDeque;
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_varint_no_interfere_other_values() {
|
||||
let mut buf: VecDeque<u8> = vec![123, 0x28, 0x21].into();
|
||||
let _ = varint_read(&mut buf);
|
||||
|
||||
assert_eq!(buf, vec![0x28, 0x21]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_varint_right_answer() {
|
||||
let mut buf: VecDeque<u8> = vec![0xa8, 0x60].into();
|
||||
let res = varint_read(&mut buf);
|
||||
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(res, Ok(12328));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_varint_incomplete() {
|
||||
let mut buf: VecDeque<u8> = vec![0xa8].into();
|
||||
let res = varint_read(&mut buf);
|
||||
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(res.is_err(), true);
|
||||
}
|
||||
#[test]
|
||||
fn test_varint_limits() {
|
||||
let mut buf: VecDeque<u8> = vec![0x0].into();
|
||||
let res_zero = varint_read(&mut buf);
|
||||
|
||||
let mut buf: VecDeque<u8> = vec![0xff, 0xff, 0xff, 0xff, 0x07].into();
|
||||
let res_max_int = varint_read(&mut buf);
|
||||
|
||||
let mut buf: VecDeque<u8> = vec![0x80, 0x80, 0x80, 0x80, 0x8].into();
|
||||
let res_min_int = varint_read(&mut buf);
|
||||
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(res_zero, Ok(0));
|
||||
assert_eq!(res_max_int, Ok(2147483647));
|
||||
assert_eq!(res_min_int, Ok(-2147483648));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_varint_write_normal() {
|
||||
let res = varint_write(82149);
|
||||
assert_eq!(res, vec![0xe5, 0x81, 0x05]);
|
||||
}
|
||||
#[test]
|
||||
fn test_varint_write_limits() {
|
||||
let res_zero = varint_write(0);
|
||||
let res_max_int = varint_write(2147483647);
|
||||
let res_min_int = varint_write(-2147483648);
|
||||
|
||||
assert_eq!(res_zero, vec![0x00]);
|
||||
assert_eq!(res_max_int, vec![0xff, 0xff, 0xff, 0xff, 0x07]);
|
||||
assert_eq!(res_min_int, vec![0x80, 0x80, 0x80, 0x80, 0x8])
|
||||
}
|
||||
1
src/tests/mod.rs
Normal file
1
src/tests/mod.rs
Normal file
@ -0,0 +1 @@
|
||||
pub mod minecraft;
|
||||
Reference in New Issue
Block a user