From 8c4107a8b4c3048a7c03fbcff8179340198c3bc4 Mon Sep 17 00:00:00 2001 From: dolzhuying <1240800466@qq.com> Date: Tue, 15 Apr 2025 10:10:04 +0800 Subject: [PATCH] fix(log):replace all println! with log --- Cargo.lock | 2 + crates/app/Cargo.toml | 2 + crates/app/src/main.rs | 13 ++++--- crates/provider/Cargo.toml | 2 +- crates/provider/src/handlers/delete.rs | 5 ++- crates/provider/src/handlers/deploy.rs | 12 +++--- crates/provider/src/handlers/function_get.rs | 2 +- .../provider/src/handlers/invoke_resolver.rs | 4 +- crates/provider/src/handlers/utils.rs | 2 +- crates/provider/src/proxy/proxy_handler.rs | 2 +- crates/provider/src/types/mod.rs | 1 - crates/service/src/lib.rs | 38 +++++++++---------- 12 files changed, 45 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 539a748..8db840c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -848,6 +848,8 @@ version = "0.1.0" dependencies = [ "actix-web", "dotenv", + "env_logger", + "log", "my-workspace-hack", "provider", "serde 1.0.217", diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml index 03b3d32..c10ac36 100644 --- a/crates/app/Cargo.toml +++ b/crates/app/Cargo.toml @@ -12,3 +12,5 @@ serde_json = "1.0" my-workspace-hack = { version = "0.1", path = "../my-workspace-hack" } provider = { path = "../provider" } dotenv = "0.15" +env_logger = "0.10" +log = "0.4.27" diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs index ac8a345..e8c6342 100644 --- a/crates/app/src/main.rs +++ b/crates/app/src/main.rs @@ -1,16 +1,17 @@ use std::sync::Arc; use actix_web::{App, HttpServer, web}; -use service::Service; use provider::{ handlers::{delete::delete_handler, deploy::deploy_handler, invoke_resolver::InvokeResolver}, proxy::proxy_handler::proxy_handler, types::config::FaaSConfig, }; +use service::Service; #[actix_web::main] async fn main() -> std::io::Result<()> { dotenv::dotenv().ok(); + env_logger::init_from_env(env_logger::Env::new().default_filter_or("info")); let service = Arc::new( Service::new("/run/containerd/containerd.sock") .await @@ -20,7 +21,7 @@ async fn main() -> std::io::Result<()> { let resolver = Some(InvokeResolver::new(service.clone()).await); let faas_config = FaaSConfig::new(); - println!("I'm running!"); + log::info!("I'm running!"); let server = HttpServer::new(move || { App::new() @@ -34,7 +35,7 @@ async fn main() -> std::io::Result<()> { }) .bind("0.0.0.0:8090")?; - println!("0.0.0.0:8090"); + log::info!("Running on 0.0.0.0:8090..."); server.run().await } @@ -49,9 +50,9 @@ mod tests { let bin = std::env::var("CNI_BIN_DIR").unwrap_or_else(|_| "Not set".to_string()); let conf = std::env::var("CNI_CONF_DIR").unwrap_or_else(|_| "Not set".to_string()); let tool = std::env::var("CNI_TOOL").unwrap_or_else(|_| "Not set".to_string()); - println!("CNI_BIN_DIR: {bin}"); - println!("CNI_CONF_DIR: {conf}"); - println!("CNI_TOOL: {tool}"); + log::debug!("CNI_BIN_DIR: {bin}"); + log::debug!("CNI_CONF_DIR: {conf}"); + log::debug!("CNI_TOOL: {tool}"); // for (key, value) in &result { // println!("{}={}", key, value); // } diff --git a/crates/provider/Cargo.toml b/crates/provider/Cargo.toml index f93b75e..545633b 100644 --- a/crates/provider/Cargo.toml +++ b/crates/provider/Cargo.toml @@ -28,7 +28,7 @@ service = { path = "../service" } cni = { path = "../cni" } async-trait = "0.1" lazy_static = "1.4.0" -log = "0.4" +log = "0.4.27" my-workspace-hack = { version = "0.1", path = "../my-workspace-hack" } url = "2.4" derive_more = { version = "2", features = ["full"] } diff --git a/crates/provider/src/handlers/delete.rs b/crates/provider/src/handlers/delete.rs index 2dcace9..92c87fa 100644 --- a/crates/provider/src/handlers/delete.rs +++ b/crates/provider/src/handlers/delete.rs @@ -42,10 +42,11 @@ async fn delete( } let function = get_function(service, function_name, namespace).await?; if function.replicas != 0 { - println!(" delete_cni_network ing {:?}", function.replicas); + log::info!("function.replicas: {:?}", function.replicas); cni::delete_cni_network(namespace, function_name); + log::info!("delete_cni_network ok"); } else { - println!(" function.replicas {:?}", function.replicas); + log::info!("function.replicas: {:?}", function.replicas); } service .remove_container(function_name, namespace) diff --git a/crates/provider/src/handlers/deploy.rs b/crates/provider/src/handlers/deploy.rs index 76625f1..8492512 100644 --- a/crates/provider/src/handlers/deploy.rs +++ b/crates/provider/src/handlers/deploy.rs @@ -50,7 +50,7 @@ async fn deploy(service: &Arc, config: &FunctionDeployment) -> Result<( // namespace // )))); // } - println!( + log::info!( "Namespace '{}' validated.", config.namespace.clone().unwrap() ); @@ -71,16 +71,18 @@ async fn deploy(service: &Arc, config: &FunctionDeployment) -> Result<( ImageManager::prepare_image(client, &config.image, &namespace, true) .await .map_err(CustomError::from)?; - println!("Image '{}' validated", &config.image); + log::info!("Image '{}' validated ,", &config.image); service .create_container(&config.image, &config.service, &namespace) .await .map_err(|e| CustomError::OtherError(format!("failed to create container:{}", e)))?; - println!( + log::info!( "Container {} created using image {} in namespace {}", - &config.service, &config.image, namespace + &config.service, + &config.image, + namespace ); service @@ -92,7 +94,7 @@ async fn deploy(service: &Arc, config: &FunctionDeployment) -> Result<( &config.service, e )) })?; - println!( + log::info!( "Task for container {} was created successfully", &config.service ); diff --git a/crates/provider/src/handlers/function_get.rs b/crates/provider/src/handlers/function_get.rs index 27b23e6..235b541 100644 --- a/crates/provider/src/handlers/function_get.rs +++ b/crates/provider/src/handlers/function_get.rs @@ -64,7 +64,7 @@ pub async fn get_function( } } Err(e) => { - eprintln!("Failed to get task: {}", e); + log::error!("Failed to get task: {}", e); replicas = 0; } } diff --git a/crates/provider/src/handlers/invoke_resolver.rs b/crates/provider/src/handlers/invoke_resolver.rs index 0c1c30a..88adce7 100644 --- a/crates/provider/src/handlers/invoke_resolver.rs +++ b/crates/provider/src/handlers/invoke_resolver.rs @@ -33,11 +33,9 @@ impl InvokeResolver { return Err(ErrorInternalServerError("Failed to get function")); } }; + log::info!("Function:{:?}", function); - //容器启动后的port? let address = function.address.clone(); - println!("function: {:?}", function); - let urlstr = format!("http://{}", address); match Url::parse(&urlstr) { Ok(url) => Ok(url), diff --git a/crates/provider/src/handlers/utils.rs b/crates/provider/src/handlers/utils.rs index 9717817..0b746fb 100644 --- a/crates/provider/src/handlers/utils.rs +++ b/crates/provider/src/handlers/utils.rs @@ -4,7 +4,7 @@ use derive_more::Display; use service::image_manager::ImageError; pub fn map_service_error(e: Box) -> Error { - eprintln!("Service error: {}", e); + log::error!("Service error: {}", e); actix_web::error::ErrorInternalServerError(format!("Operationfailed: {}", e)) } diff --git a/crates/provider/src/proxy/proxy_handler.rs b/crates/provider/src/proxy/proxy_handler.rs index 6477704..1fe4566 100644 --- a/crates/provider/src/proxy/proxy_handler.rs +++ b/crates/provider/src/proxy/proxy_handler.rs @@ -19,7 +19,7 @@ pub async fn proxy_handler( .expect("empty proxy handler resolver, cannot be nil"); let proxy_client = new_proxy_client_from_config(config.as_ref()).await; - println!("proxy_client : {:?}", proxy_client); + log::info!("proxy_client : {:?}", proxy_client); match *req.method() { Method::POST diff --git a/crates/provider/src/types/mod.rs b/crates/provider/src/types/mod.rs index 0d73aeb..e6e144a 100644 --- a/crates/provider/src/types/mod.rs +++ b/crates/provider/src/types/mod.rs @@ -1,3 +1,2 @@ pub mod config; pub mod function_deployment; - diff --git a/crates/service/src/lib.rs b/crates/service/src/lib.rs index b04c62c..9aa741a 100644 --- a/crates/service/src/lib.rs +++ b/crates/service/src/lib.rs @@ -146,11 +146,11 @@ impl Service { }; let mut cc = self.client.containers(); - let responce = cc + let response = cc .list(with_namespace!(request, namespace)) .await? .into_inner(); - let container = responce + let container = response .containers .iter() .find(|container| container.id == cid); @@ -161,15 +161,15 @@ impl Service { let request = ListTasksRequest { filter: format!("container=={}", cid), }; - let responce = tc + let response = tc .list(with_namespace!(request, namespace)) .await? .into_inner(); - println!("Tasks: {:?}", responce.tasks); + log::info!("Tasks: {:?}", response.tasks); drop(tc); - if let Some(task) = responce.tasks.iter().find(|task| task.id == container.id) { - println!("Task found: {}, Status: {}", task.id, task.status); + if let Some(task) = response.tasks.iter().find(|task| task.id == container.id) { + log::info!("Task found: {}, Status: {}", task.id, task.status); // TASK_UNKNOWN (0) — 未知状态 // TASK_CREATED (1) — 任务已创建 // TASK_RUNNING (2) — 任务正在运行 @@ -192,7 +192,7 @@ impl Service { //todo 这里删除cni? self.remove_netns_ip(cid).await; - println!("Container: {:?} deleted", cc); + log::info!("Container: {:?} deleted", cc); } else { todo!("Container not found"); } @@ -227,17 +227,17 @@ impl Service { .into_inner() .mounts; - println!("mounts ok"); + log::info!("mounts ok"); drop(sc); - println!("drop sc ok"); + log::info!("drop sc ok"); let _ = cni::init_net_work(); - println!("init_net_work ok"); + log::info!("init_net_work ok"); let (ip, path) = cni::create_cni_network(cid.to_string(), ns.to_string())?; let ports = ImageManager::get_runtime_config(img_name).unwrap().ports; let network_config = NetworkConfig::new(path, ip, ports); - println!("create_cni_network ok"); + log::info!("create_cni_network ok"); self.save_network_config(cid, network_config.clone()).await; - println!("save_netns_ip ok, netconfig: {:?}", network_config); + log::info!("save_netns_ip ok, netconfig: {:?}", network_config); let mut tc = self.client.tasks(); let req = CreateTaskRequest { container_id: cid.to_string(), @@ -255,7 +255,7 @@ impl Service { ..Default::default() }; let _resp = self.client.tasks().start(with_namespace!(req, ns)).await?; - println!("Task: {:?} started", cid); + log::info!("Task: {:?} started", cid); Ok(()) } @@ -299,7 +299,7 @@ impl Service { Ok::<(), Err>(()) }) .await; - println!(" after wait"); + log::info!("after wait"); let kill_request = KillRequest { container_id: cid.to_string(), @@ -324,17 +324,17 @@ impl Service { // println!("Task: {:?} deleted", cid); match c.delete(with_namespace!(req, namespace)).await { Ok(_) => { - println!("Task: {:?} deleted", cid); + log::info!("Task: {:?} deleted", cid); Ok(()) } Err(e) => { - eprintln!("Failed to delete task: {}", e); + log::error!("Failed to delete task: {}", e); Err(e.into()) } } } Ok(Err(e)) => { - eprintln!("Wait task failed: {}", e); + log::error!("Wait task failed: {}", e); Err(e) } Err(_) => { @@ -346,11 +346,11 @@ impl Service { }; match c.kill(with_namespace!(kill_request, namespace)).await { Ok(_) => { - println!("Task: {:?} force killed", cid); + log::info!("Task: {:?} force killed", cid); Ok(()) } Err(e) => { - eprintln!("Failed to force kill task: {}", e); + log::error!("Failed to force kill task: {}", e); Err(e.into()) } }