Merge pull request #229 from GOODBOY008/hotfix

refactor: fix typos and improve error messages

Author: heqingpan

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))
     }

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()),

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 {

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 {

src/naming/api_model.rs

@@ -149,7 +149,7 @@ impl ServiceInfoParam {
     pub(crate) fn build_service_info(self) -> anyhow::Result<ServiceDetailDto> {
         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) {

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<Addr<NamingActor>>,
         node: &mut ClusterInnerNode,
     ) {

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 {

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"))
         }
     }
 }

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

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::<Vec<_>>();
         if split.is_empty() {
             return None;