rename dockermgr to srvmgr
This commit is contained in:
@ -10,7 +10,7 @@ use crate::{DbPool, schema, models};
|
||||
|
||||
use diesel::prelude::*;
|
||||
|
||||
use crate::dockermgr;
|
||||
use crate::srvmgr;
|
||||
|
||||
use async_process;
|
||||
|
||||
@ -39,7 +39,7 @@ pub async fn subcommand(arguments: &ArgMatches, pool: &DbPool, docker: &Docker)
|
||||
|
||||
if server.status == ServerStatus::Running {
|
||||
println!("Stopping container");
|
||||
dockermgr::stop_server(&docker, pool, server_name).await?;
|
||||
srvmgr::stop_server(&docker, pool, server_name).await?;
|
||||
println!("container stopped");
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
use bollard::Docker;
|
||||
use clap::{Arg, ArgMatches, Command};
|
||||
|
||||
use crate::{Config, DbPool, dockermgr};
|
||||
use crate::{Config, DbPool, srvmgr};
|
||||
|
||||
use std::fs;
|
||||
|
||||
@ -21,7 +21,7 @@ pub async fn subcommand(arguments: &ArgMatches, pool: &DbPool, docker: &Docker)
|
||||
|
||||
let conn = &mut pool.get().unwrap();
|
||||
|
||||
let _ = dockermgr::stop_server(docker, pool, server_name).await;
|
||||
let _ = srvmgr::stop_server(docker, pool, server_name).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 {
|
||||
|
||||
@ -5,7 +5,7 @@ use clap::{Command, ArgMatches};
|
||||
|
||||
use crate::{ DbPool, schema };
|
||||
|
||||
use crate::dockermgr;
|
||||
use crate::srvmgr;
|
||||
|
||||
use diesel::prelude::*;
|
||||
|
||||
@ -18,7 +18,7 @@ pub fn create_subcommand() -> Command {
|
||||
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();
|
||||
dockermgr::start_server(&docker, pool, server_name).await?;
|
||||
srvmgr::start_server(&docker, pool, server_name).await?;
|
||||
|
||||
diesel::update(servers).filter(name.eq(server_name)).set(last_login.eq(Utc::now().naive_utc())).execute(&mut pool.get().unwrap()).map_err(|e| format!("Failed to set the last login date: {}", e))?;
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ use clap::{Command, ArgMatches};
|
||||
|
||||
use crate::DbPool;
|
||||
|
||||
use crate::dockermgr;
|
||||
use crate::srvmgr;
|
||||
|
||||
pub fn create_subcommand() -> Command {
|
||||
Command::new("stop")
|
||||
@ -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");
|
||||
dockermgr::stop_server(&docker, pool, server_name).await?;
|
||||
srvmgr::stop_server(&docker, pool, server_name).await?;
|
||||
println!("container stopped");
|
||||
|
||||
Ok(())
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2026/05/29 21:22:17 by tomoron #+# #+# */
|
||||
/* Updated: 2026/06/12 17:03:13 by tomoron ### ########.fr */
|
||||
/* Updated: 2026/06/12 18:32:19 by tomoron ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -20,7 +20,7 @@ pub mod models;
|
||||
|
||||
pub mod status;
|
||||
|
||||
pub mod dockermgr;
|
||||
pub mod srvmgr;
|
||||
|
||||
mod cli;
|
||||
use cli::*;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
use crate::{dockermgr::start_server, minecraft::client::client::Client};
|
||||
use crate::{srvmgr::start_server, minecraft::client::client::Client};
|
||||
|
||||
use diesel::result::Error::NotFound;
|
||||
use json::object;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
use bollard::Docker;
|
||||
use chrono::{TimeDelta, Utc};
|
||||
|
||||
use crate::{ DbPool, cli::archive::archive_server, dockermgr, models::{self, Servers}, schema, status::ServerStatus };
|
||||
use crate::{ DbPool, cli::archive::archive_server, srvmgr, models::{self, Servers}, schema, status::ServerStatus };
|
||||
|
||||
use async_std::task;
|
||||
|
||||
@ -57,7 +57,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 _ = dockermgr::stop_server(docker, pool, &srv.name).await;
|
||||
let _ = srvmgr::stop_server(docker, pool, &srv.name).await;
|
||||
println!("{} stopped", srv.name);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
use bollard::{Docker, plugin::{ContainerCreateBody, HostConfig, Mount, MountType}, query_parameters::CreateContainerOptionsBuilder};
|
||||
use diesel::{prelude::*, result::Error::NotFound};
|
||||
|
||||
use crate::{dockermgr::utils::get_image_tag, models, schema, status::ServerStatus};
|
||||
use crate::{srvmgr::utils::get_image_tag, models, schema, status::ServerStatus};
|
||||
|
||||
use crate::{DbPool, dockermgr::utils::{self, get_container_ip}};
|
||||
use crate::{DbPool, srvmgr::utils::{self, get_container_ip}};
|
||||
|
||||
async fn start_docker_container(docker: &Docker, name: &String) -> Result<String, String> {
|
||||
|
||||
Reference in New Issue
Block a user