diff --git a/src/common/limiter_utils.rs b/src/common/limiter_utils.rs index 3b385b59..c4b18ddf 100644 --- a/src/common/limiter_utils.rs +++ b/src/common/limiter_utils.rs @@ -34,17 +34,17 @@ impl TryFrom<&str> for LimiterData { let a: i32 = if let Some(e) = iter.next() { e.parse()? } else { - return Err(anyhow::anyhow!("limiter is unvalid")); + return Err(anyhow::anyhow!("limiter is invalid")); }; let b: i32 = if let Some(e) = iter.next() { e.parse()? } else { - return Err(anyhow::anyhow!("limiter is unvalid")); + return Err(anyhow::anyhow!("limiter is invalid")); }; let c: i64 = if let Some(e) = iter.next() { e.parse()? } else { - return Err(anyhow::anyhow!("limiter is unvalid")); + return Err(anyhow::anyhow!("limiter is invalid")); }; Ok(Self::new(a, b, c)) } diff --git a/src/console/v2/naming_api.rs b/src/console/v2/naming_api.rs index 5eefd78f..19b30e0b 100644 --- a/src/console/v2/naming_api.rs +++ b/src/console/v2/naming_api.rs @@ -237,7 +237,7 @@ pub async fn add_instance( if !namespace_privilege.check_permission(&instance.namespace_id) { user_no_namespace_permission!(&instance.namespace_id); } - if !instance.check_vaild() { + if !instance.check_valid() { HttpResponse::Ok().json(ApiResult::<()>::error( ERROR_CODE_SYSTEM_ERROR.to_string(), Some("instance check is invalid".to_string()), @@ -274,7 +274,7 @@ pub async fn remove_instance( if !namespace_privilege.check_permission(&instance.namespace_id) { user_no_namespace_permission!(&instance.namespace_id); } - if !instance.check_vaild() { + if !instance.check_valid() { HttpResponse::Ok().json(ApiResult::<()>::error( ERROR_CODE_SYSTEM_ERROR.to_string(), Some("instance check is invalid".to_string()), diff --git a/src/grpc/handler/naming_batch_instance.rs b/src/grpc/handler/naming_batch_instance.rs index 2cba459f..a58c295b 100644 --- a/src/grpc/handler/naming_batch_instance.rs +++ b/src/grpc/handler/naming_batch_instance.rs @@ -66,7 +66,7 @@ impl BatchInstanceRequestHandler { } else if !service_name.is_empty() { service_name.clone() } else { - return Err(anyhow::format_err!("serivceName is unvaild!")); + return Err(anyhow::format_err!("serviceName is invalid!")); }; let mut instance = Instance { diff --git a/src/grpc/handler/naming_instance.rs b/src/grpc/handler/naming_instance.rs index 2d82e99b..cb143964 100644 --- a/src/grpc/handler/naming_instance.rs +++ b/src/grpc/handler/naming_instance.rs @@ -60,7 +60,7 @@ impl InstanceRequestHandler { } else if let Some(v) = request.service_name { Arc::new(v) } else { - return Err(anyhow::format_err!("serivceName is unvaild!")); + return Err(anyhow::format_err!("serviceName is invalid!")); }; let now = now_millis_i64(); let mut instance = Instance { diff --git a/src/naming/api_model.rs b/src/naming/api_model.rs index b9a92f82..bcc1b7a7 100644 --- a/src/naming/api_model.rs +++ b/src/naming/api_model.rs @@ -149,7 +149,7 @@ impl ServiceInfoParam { pub(crate) fn build_service_info(self) -> anyhow::Result { if let Some(service_name) = self.service_name { if service_name.is_empty() { - return Err(anyhow::anyhow!("service_name is vaild")); + return Err(anyhow::anyhow!("service_name is valid")); } let metadata = if let Some(metadata_str) = self.metadata { match NamingUtils::parse_metadata(&metadata_str) { diff --git a/src/naming/cluster/node_manage.rs b/src/naming/cluster/node_manage.rs index 91a164a1..74319f7c 100644 --- a/src/naming/cluster/node_manage.rs +++ b/src/naming/cluster/node_manage.rs @@ -25,7 +25,7 @@ use std::{ #[derive(Debug, Clone, PartialEq, Eq)] pub enum NodeStatus { Valid, - Unvalid, + Invalid, } impl Default for NodeStatus { @@ -363,14 +363,14 @@ impl InnerNodeManage { */ if !node.is_local && node.status == NodeStatus::Valid && node.last_active_time < timeout { - node.status = NodeStatus::Unvalid; - Self::client_unvalid_instance(naming_actor, node); + node.status = NodeStatus::Invalid; + Self::client_invalid_instance(naming_actor, node); } } self.update_process_range(); } - fn client_unvalid_instance( + fn client_invalid_instance( naming_actor: &Option>, node: &mut ClusterInnerNode, ) { diff --git a/src/naming/core.rs b/src/naming/core.rs index 67ccbdf6..6ed7a84b 100644 --- a/src/naming/core.rs +++ b/src/naming/core.rs @@ -385,7 +385,7 @@ impl NamingActor { from_sync: bool, ) -> UpdateInstanceType { instance.init(); - //assert!(instance.check_vaild()); + //assert!(instance.check_valid()); self.create_empty_service(key); //let is_from_from_cluster = instance.is_from_cluster(); let at_process_range = if let Some(range) = &self.current_range { diff --git a/src/naming/dal/service_actor.rs b/src/naming/dal/service_actor.rs index 6405d48c..58dcf846 100644 --- a/src/naming/dal/service_actor.rs +++ b/src/naming/dal/service_actor.rs @@ -60,7 +60,7 @@ create index if not exists tb_service_key_idx on tb_service(namespace_id,service Ok(()) } else{ - Err(anyhow::anyhow!("update_service:unvaild service info")) + Err(anyhow::anyhow!("update_service:invalid service info")) } } } diff --git a/src/naming/dal/service_do.rs b/src/naming/dal/service_do.rs index 4f43119f..a8559f27 100644 --- a/src/naming/dal/service_do.rs +++ b/src/naming/dal/service_do.rs @@ -36,7 +36,7 @@ impl ServiceDO { s } - pub fn check_vaild(&self) -> bool { + pub fn check_valid(&self) -> bool { if let (Some(namespace_id),Some(service_name),Some(group_name)) = (self.namespace_id.as_ref(),self.service_name.as_ref(),self.group_name.as_ref()) { true diff --git a/src/naming/mod.rs b/src/naming/mod.rs index 6e1a1b92..6255a58c 100644 --- a/src/naming/mod.rs +++ b/src/naming/mod.rs @@ -34,7 +34,7 @@ impl NamingUtils { format!("{}@@{}", group_name, service_name) } - pub fn split_group_and_serivce_name(grouped_name: &str) -> Option<(String, String)> { + pub fn split_group_and_service_name(grouped_name: &str) -> Option<(String, String)> { let split = grouped_name.split("@@").collect::>(); if split.is_empty() { return None; diff --git a/src/naming/model.rs b/src/naming/model.rs index 7b2fddf7..65aa96b2 100644 --- a/src/naming/model.rs +++ b/src/naming/model.rs @@ -59,7 +59,7 @@ impl Instance { } } - pub fn check_vaild(&self) -> bool { + pub fn check_valid(&self) -> bool { if self.id.is_empty() && self.port == 0 && self.service_name.is_empty() @@ -210,11 +210,11 @@ pub struct ServiceKey { } impl ServiceKey { - pub fn new(namespace_id: &str, group_name: &str, serivce_name: &str) -> Self { + pub fn new(namespace_id: &str, group_name: &str, service_name: &str) -> Self { Self { namespace_id: Arc::new(namespace_id.to_owned()), group_name: Arc::new(group_name.to_owned()), - service_name: Arc::new(serivce_name.to_owned()), + service_name: Arc::new(service_name.to_owned()), } } diff --git a/src/openapi/naming/instance.rs b/src/openapi/naming/instance.rs index fad70c23..e7d5cd9c 100644 --- a/src/openapi/naming/instance.rs +++ b/src/openapi/naming/instance.rs @@ -89,7 +89,7 @@ pub async fn update_instance( let instance = param.convert_to_instance(); match instance { Ok(instance) => { - if !instance.check_vaild() { + if !instance.check_valid() { HttpResponse::InternalServerError().body("instance check is invalid") } else { match appdata @@ -115,7 +115,7 @@ pub async fn del_instance( let instance = param.convert_to_instance(); match instance { Ok(instance) => { - if !instance.check_vaild() { + if !instance.check_valid() { HttpResponse::InternalServerError().body("instance check is invalid") } else { match appdata.naming_route.delete_instance(instance).await { @@ -140,7 +140,7 @@ pub async fn beat_instance( let instance = param.convert_to_instance(); match instance { Ok(instance) => { - if !instance.check_vaild() { + if !instance.check_valid() { HttpResponse::InternalServerError().body("instance check is invalid") } else { let tag = InstanceUpdateTag { diff --git a/src/openapi/naming/model.rs b/src/openapi/naming/model.rs index c6bb0390..c877c44d 100644 --- a/src/openapi/naming/model.rs +++ b/src/openapi/naming/model.rs @@ -77,12 +77,12 @@ impl InstanceWebParams { let grouped_name = self.service_name.unwrap_or_default(); if let Some((group_name, service_name)) = - NamingUtils::split_group_and_serivce_name(&grouped_name) + NamingUtils::split_group_and_service_name(&grouped_name) { instance.service_name = Arc::new(service_name); instance.group_name = Arc::new(group_name); } else { - return Err("serivceName is unvaild!".to_owned()); + return Err("serviceName is invalid!".to_owned()); } if let Some(group_name) = self.group_name { if !group_name.is_empty() { @@ -121,12 +121,12 @@ impl InstanceWebQueryListParams { let mut group_name = "".to_owned(); let grouped_name = self.service_name.clone().unwrap_or_default(); if let Some((_group_name, _service_name)) = - NamingUtils::split_group_and_serivce_name(&grouped_name) + NamingUtils::split_group_and_service_name(&grouped_name) { service_name = _service_name; group_name = _group_name; } else { - return Err("serivceName is unvaild!".to_owned()); + return Err("serviceName is invalid!".to_owned()); } if let Some(_group_name) = self.group_name.as_ref() { if !_group_name.is_empty() { @@ -219,7 +219,7 @@ impl BeatRequest { if service_name_option.is_none() { let grouped_name = self.service_name.unwrap(); if let Some((group_name, service_name)) = - NamingUtils::split_group_and_serivce_name(&grouped_name) + NamingUtils::split_group_and_service_name(&grouped_name) { instance.service_name = Arc::new(service_name); instance.group_name = Arc::new(group_name); @@ -263,7 +263,7 @@ impl BeatRequest { if service_name_option.is_none() { if let Some(grouped_name) = self.service_name { if let Some((group_name, service_name)) = - NamingUtils::split_group_and_serivce_name(&grouped_name) + NamingUtils::split_group_and_service_name(&grouped_name) { instance.service_name = Arc::new(service_name); instance.group_name = Arc::new(group_name); @@ -323,7 +323,7 @@ impl BeatInfo { }; if let Some(grouped_name) = self.service_name.as_ref() { if let Some((group_name, service_name)) = - NamingUtils::split_group_and_serivce_name(grouped_name) + NamingUtils::split_group_and_service_name(grouped_name) { instance.service_name = Arc::new(service_name); instance.group_name = Arc::new(group_name); diff --git a/test_cluster.sh b/test_cluster.sh index a86292a7..668a4ad7 100755 --- a/test_cluster.sh +++ b/test_cluster.sh @@ -5,7 +5,7 @@ set -o errexit action=$1 usage() { - echo "cmd args unvalid" + echo "cmd args invalid" echo "usage: $0 start | start_debug | restart | restart_debug | kill | clean | test_naming" exit 2 }