From 1fa270f89b55d32f29f8d2a88f95f6f66cead049 Mon Sep 17 00:00:00 2001 From: leon3s Date: Tue, 9 Jan 2024 12:37:36 +0100 Subject: [PATCH] rename func --- bin/nanocld/src/objects/cargo.rs | 2 +- bin/nanocld/src/objects/generic/process.rs | 8 ++++---- bin/nanocld/src/objects/vm.rs | 4 ++-- bin/nanocld/src/services/process.rs | 24 +++++++++++----------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/nanocld/src/objects/cargo.rs b/bin/nanocld/src/objects/cargo.rs index 617f0e829..f242c550c 100644 --- a/bin/nanocld/src/objects/cargo.rs +++ b/bin/nanocld/src/objects/cargo.rs @@ -136,7 +136,7 @@ impl ObjPutByPk for CargoDb { Ok(instances) => instances, }; // start created containers - match CargoDb::start_process_by_kind_pk(pk, state).await { + match CargoDb::start_process_by_kind_key(pk, state).await { Err(err) => { log::error!( "Unable to start cargo instance {} : {err}", diff --git a/bin/nanocld/src/objects/generic/process.rs b/bin/nanocld/src/objects/generic/process.rs index c5a5fd622..71d1ce6ae 100644 --- a/bin/nanocld/src/objects/generic/process.rs +++ b/bin/nanocld/src/objects/generic/process.rs @@ -107,7 +107,7 @@ pub trait ObjProcess { Process::try_from(process).map_err(HttpError::from) } - async fn start_process_by_kind_pk( + async fn start_process_by_kind_key( kind_pk: &str, state: &SystemState, ) -> HttpResult<()> { @@ -130,7 +130,7 @@ pub trait ObjProcess { Ok(()) } - async fn stop_process_by_kind_pk( + async fn stop_process_by_kind_key( kind_pk: &str, state: &SystemState, ) -> HttpResult<()> { @@ -153,7 +153,7 @@ pub trait ObjProcess { Ok(()) } - async fn restart_process_by_kind_pk( + async fn restart_process_by_kind_key( pk: &str, state: &SystemState, ) -> HttpResult<()> { @@ -176,7 +176,7 @@ pub trait ObjProcess { Ok(()) } - async fn kill_process_by_kind_pk( + async fn kill_process_by_kind_key( pk: &str, opts: &CargoKillOptions, state: &SystemState, diff --git a/bin/nanocld/src/objects/vm.rs b/bin/nanocld/src/objects/vm.rs index ee6692ad7..c0b9051af 100644 --- a/bin/nanocld/src/objects/vm.rs +++ b/bin/nanocld/src/objects/vm.rs @@ -98,7 +98,7 @@ impl ObjPutByPk for VmDb { ) -> HttpResult { let vm = VmDb::transform_read_by_pk(pk, &state.pool).await?; let container_name = format!("{}.v", &vm.spec.vm_key); - VmDb::stop_process_by_kind_pk(pk, state).await?; + VmDb::stop_process_by_kind_key(pk, state).await?; VmDb::del_process_by_pk( &container_name, None::, @@ -114,7 +114,7 @@ impl ObjPutByPk for VmDb { .await?; let image = VmImageDb::read_by_pk(&vm.spec.disk.image, &state.pool).await?; utils::vm::create_instance(&vm, &image, false, state).await?; - VmDb::start_process_by_kind_pk(&vm.spec.vm_key, state).await?; + VmDb::start_process_by_kind_key(&vm.spec.vm_key, state).await?; Ok(vm) } } diff --git a/bin/nanocld/src/services/process.rs b/bin/nanocld/src/services/process.rs index f243d8dcd..3ef6c09aa 100644 --- a/bin/nanocld/src/services/process.rs +++ b/bin/nanocld/src/services/process.rs @@ -137,13 +137,13 @@ pub async fn start_process( let kind_pk = utils::key::gen_kind_key(&kind, &name, &qs.namespace); match &kind { ProcessKind::Vm => { - VmDb::start_process_by_kind_pk(&kind_pk, &state).await?; + VmDb::start_process_by_kind_key(&kind_pk, &state).await?; } ProcessKind::Job => { - JobDb::start_process_by_kind_pk(&kind_pk, &state).await?; + JobDb::start_process_by_kind_key(&kind_pk, &state).await?; } ProcessKind::Cargo => { - CargoDb::start_process_by_kind_pk(&kind_pk, &state).await?; + CargoDb::start_process_by_kind_key(&kind_pk, &state).await?; } } Ok(web::HttpResponse::Accepted().finish()) @@ -174,13 +174,13 @@ pub async fn restart_process( let kind_pk = utils::key::gen_kind_key(&kind, &name, &qs.namespace); match &kind { ProcessKind::Vm => { - VmDb::restart_process_by_kind_pk(&kind_pk, &state).await?; + VmDb::restart_process_by_kind_key(&kind_pk, &state).await?; } ProcessKind::Job => { - JobDb::restart_process_by_kind_pk(&kind_pk, &state).await?; + JobDb::restart_process_by_kind_key(&kind_pk, &state).await?; } ProcessKind::Cargo => { - CargoDb::restart_process_by_kind_pk(&kind_pk, &state).await?; + CargoDb::restart_process_by_kind_key(&kind_pk, &state).await?; } } Ok(web::HttpResponse::Accepted().finish()) @@ -211,13 +211,13 @@ pub async fn stop_process( let kind_pk = utils::key::gen_kind_key(&kind, &name, &qs.namespace); match &kind { ProcessKind::Vm => { - VmDb::stop_process_by_kind_pk(&kind_pk, &state).await?; + VmDb::stop_process_by_kind_key(&kind_pk, &state).await?; } ProcessKind::Job => { - JobDb::stop_process_by_kind_pk(&kind_pk, &state).await?; + JobDb::stop_process_by_kind_key(&kind_pk, &state).await?; } ProcessKind::Cargo => { - CargoDb::stop_process_by_kind_pk(&kind_pk, &state).await?; + CargoDb::stop_process_by_kind_key(&kind_pk, &state).await?; } } Ok(web::HttpResponse::Accepted().finish()) @@ -250,13 +250,13 @@ pub async fn kill_process( let kind_pk = utils::key::gen_kind_key(&kind, &name, &qs.namespace); match &kind { ProcessKind::Vm => { - VmDb::kill_process_by_kind_pk(&kind_pk, &payload, &state).await?; + VmDb::kill_process_by_kind_key(&kind_pk, &payload, &state).await?; } ProcessKind::Job => { - JobDb::kill_process_by_kind_pk(&kind_pk, &payload, &state).await?; + JobDb::kill_process_by_kind_key(&kind_pk, &payload, &state).await?; } ProcessKind::Cargo => { - CargoDb::kill_process_by_kind_pk(&kind_pk, &payload, &state).await?; + CargoDb::kill_process_by_kind_key(&kind_pk, &payload, &state).await?; } } Ok(web::HttpResponse::Ok().into())