diff --git a/api-service/src/main.rs b/api-service/src/main.rs index a11ad23..4d3dfce 100644 --- a/api-service/src/main.rs +++ b/api-service/src/main.rs @@ -34,7 +34,7 @@ async fn main() -> Result<(), Box> { let health_check_url = format!("http://{}:{}/health", service_address, health_port); // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let meta = HashMap::new(); consul_registration::register_service( diff --git a/auth-service/src/main.rs b/auth-service/src/main.rs index cd9bba5..1999603 100644 --- a/auth-service/src/main.rs +++ b/auth-service/src/main.rs @@ -38,7 +38,7 @@ async fn main() -> Result<(), Box> { let session_nodes = get_service_address(&consul_url, "session-service").await?; // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let mut meta = HashMap::new(); consul_registration::register_service( diff --git a/character-service/src/main.rs b/character-service/src/main.rs index 9686d5e..92ffb9f 100644 --- a/character-service/src/main.rs +++ b/character-service/src/main.rs @@ -32,7 +32,7 @@ async fn main() -> Result<(), Box> { let db_nodes = get_service_address(&consul_url, "database-service").await?; // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let mut meta = HashMap::new(); meta.insert("name".to_string(), "Rose".to_string()); diff --git a/database-service/src/main.rs b/database-service/src/main.rs index f9ff2b3..62a0473 100644 --- a/database-service/src/main.rs +++ b/database-service/src/main.rs @@ -36,7 +36,7 @@ async fn main() -> Result<(), Box> { let health_check_url = format!("http://{}:{}/health", service_address, health_port); // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let meta = HashMap::new(); consul_registration::register_service( diff --git a/packet-service/src/main.rs b/packet-service/src/main.rs index 120cd62..8bf4f46 100644 --- a/packet-service/src/main.rs +++ b/packet-service/src/main.rs @@ -99,7 +99,7 @@ async fn main() -> Result<(), Box> { let auth_node = get_service_address(&consul_url, "auth-service").await?; // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let mut meta = HashMap::new(); consul_registration::register_service( diff --git a/session-service/src/main.rs b/session-service/src/main.rs index bab3ca2..b0d4b3f 100644 --- a/session-service/src/main.rs +++ b/session-service/src/main.rs @@ -39,7 +39,7 @@ async fn main() -> Result<(), Box> { let health_check_url = format!("http://{}:{}/health", service_address, health_port); // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let meta = HashMap::new(); consul_registration::register_service( diff --git a/utils/src/consul_registration.rs b/utils/src/consul_registration.rs index 270aeea..8a1a40a 100644 --- a/utils/src/consul_registration.rs +++ b/utils/src/consul_registration.rs @@ -30,8 +30,8 @@ struct ConsulCheck { pub fn generate_service_id() -> String { Uuid::new_v4().to_string() } -pub fn get_or_generate_service_id() -> String { - let package_name = env!("CARGO_PKG_NAME"); +pub fn get_or_generate_service_id(package_name: &str) -> String { + // let package_name = env!("CARGO_PKG_NAME"); let file_name = format!("{}_service_id.txt", package_name); let path = Path::new(&file_name); diff --git a/world-service/src/main.rs b/world-service/src/main.rs index 7e847e5..5596cdc 100644 --- a/world-service/src/main.rs +++ b/world-service/src/main.rs @@ -28,7 +28,7 @@ async fn main() -> Result<(), Box> { let db_nodes = get_service_address(&consul_url, "database-service").await?; // Register service with Consul - let service_id = consul_registration::get_or_generate_service_id(); + let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let tags = vec!["version-1.0".to_string()]; let mut meta = HashMap::new(); meta.insert("name".to_string(), "Athena".to_string());