- update: generate_service_id function call now takes in the service name so the id file isn't always called utils_service_id.txt

This commit is contained in:
2024-12-27 19:04:54 -05:00
parent 17f653c629
commit 00468e9600
8 changed files with 9 additions and 9 deletions

View File

@@ -34,7 +34,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let health_check_url = format!("http://{}:{}/health", service_address, health_port); let health_check_url = format!("http://{}:{}/health", service_address, health_port);
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let meta = HashMap::new(); let meta = HashMap::new();
consul_registration::register_service( consul_registration::register_service(

View File

@@ -38,7 +38,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let session_nodes = get_service_address(&consul_url, "session-service").await?; let session_nodes = get_service_address(&consul_url, "session-service").await?;
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let mut meta = HashMap::new(); let mut meta = HashMap::new();
consul_registration::register_service( consul_registration::register_service(

View File

@@ -32,7 +32,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let db_nodes = get_service_address(&consul_url, "database-service").await?; let db_nodes = get_service_address(&consul_url, "database-service").await?;
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let mut meta = HashMap::new(); let mut meta = HashMap::new();
meta.insert("name".to_string(), "Rose".to_string()); meta.insert("name".to_string(), "Rose".to_string());

View File

@@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let health_check_url = format!("http://{}:{}/health", service_address, health_port); let health_check_url = format!("http://{}:{}/health", service_address, health_port);
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let meta = HashMap::new(); let meta = HashMap::new();
consul_registration::register_service( consul_registration::register_service(

View File

@@ -99,7 +99,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let auth_node = get_service_address(&consul_url, "auth-service").await?; let auth_node = get_service_address(&consul_url, "auth-service").await?;
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let mut meta = HashMap::new(); let mut meta = HashMap::new();
consul_registration::register_service( consul_registration::register_service(

View File

@@ -39,7 +39,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let health_check_url = format!("http://{}:{}/health", service_address, health_port); let health_check_url = format!("http://{}:{}/health", service_address, health_port);
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let meta = HashMap::new(); let meta = HashMap::new();
consul_registration::register_service( consul_registration::register_service(

View File

@@ -30,8 +30,8 @@ struct ConsulCheck {
pub fn generate_service_id() -> String { pub fn generate_service_id() -> String {
Uuid::new_v4().to_string() Uuid::new_v4().to_string()
} }
pub fn get_or_generate_service_id() -> String { pub fn get_or_generate_service_id(package_name: &str) -> String {
let package_name = env!("CARGO_PKG_NAME"); // let package_name = env!("CARGO_PKG_NAME");
let file_name = format!("{}_service_id.txt", package_name); let file_name = format!("{}_service_id.txt", package_name);
let path = Path::new(&file_name); let path = Path::new(&file_name);

View File

@@ -28,7 +28,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let db_nodes = get_service_address(&consul_url, "database-service").await?; let db_nodes = get_service_address(&consul_url, "database-service").await?;
// Register service with Consul // 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 tags = vec!["version-1.0".to_string()];
let mut meta = HashMap::new(); let mut meta = HashMap::new();
meta.insert("name".to_string(), "Athena".to_string()); meta.insert("name".to_string(), "Athena".to_string());