Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

- update: characters cache key lifetime

Browse Source
This commit is contained in:
raven
2025-03-17 21:51:09 -04:00
parent cdf7bb3f15
commit f353a73658
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database-service/src/characters.rs
View File

@@ -61,7 +61,7 @@ impl CharacterRepository {
self.cache self.cache
.lock() .lock()
.await .await
.set(&cache_key, &character, 300) .set(&cache_key, &character, 0)
.await .await
.map_err(|_| sqlx::Error::RowNotFound)?; .map_err(|_| sqlx::Error::RowNotFound)?;
Ok(character) Ok(character)
@@ -164,7 +164,7 @@ impl CharacterRepository {
self.cache self.cache
.lock() .lock()
.await .await
.set(&cache_key, &characters, 300) .set(&cache_key, &characters, 0)
.await .await
.map_err(|_| sqlx::Error::RowNotFound)?; .map_err(|_| sqlx::Error::RowNotFound)?;
Ok(characters) Ok(characters)

18
world-service/src/main.rs
View File

@@ -29,12 +29,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "world-service".to_string()); let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "world-service".to_string());
let service_address = let service_address =
env::var("WORLD_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string()); env::var("WORLD_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
let service_port = port.clone(); let service_port = port.clone().parse().unwrap_or(50054);
let health_check_url = format!("http://{}:{}/health", service_address, health_port); let health_check_url = format!("http://{}:{}/health", service_address, health_port);
let db_nodes = get_service_address(&consul_url, "database-service").await?; let db_nodes = get_service_address(&consul_url, "database-service").await?;
let temp_db_nodes = get_service_endpoints_by_dns(format!("{}:{}", consul_address, consul_dns_port).as_str(), "grpc", "database-service").await?; let temp_db_nodes = get_service_endpoints_by_dns(&format!("{}:{}", consul_address, consul_dns_port), "grpc", "database-service").await?;
debug!("{:?}", temp_db_nodes); debug!("Temp DB Nodes: {:?}", temp_db_nodes);
// Register service with Consul // Register service with Consul
let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME")); let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
@@ -42,12 +42,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let tags = vec![version, "grpc".to_string()]; let tags = vec![version, "grpc".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());
consul_registration::start_health_check(addr.as_str()).await?;
consul_registration::register_service( consul_registration::register_service(
&consul_url, &consul_url,
service_id.as_str(), service_id.as_str(),
service_name.as_str(), service_name.as_str(),
service_address.as_str(), service_address.as_str(),
service_port.parse().unwrap_or(50054), service_port,
tags, tags,
meta, meta,
Some("http"), Some("http"),
@@ -56,13 +58,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.await?; .await?;
// Start health-check endpoint // Start health-check endpoint
consul_registration::start_health_check(addr.as_str()).await?;
let db_address = db_nodes.get(0).unwrap(); let db_address = temp_db_nodes.get(0).unwrap();
let db_url = format!( let db_url = format!(
"http://{}:{}", "http://{}",
db_address.ServiceAddress, db_address.ServicePort db_address
); );
debug!("DB URL: {:?}", db_url);
utils::signal_handler::wait_for_signal().await; utils::signal_handler::wait_for_signal().await;
consul_registration::deregister_service(&consul_url, service_id.as_str()) consul_registration::deregister_service(&consul_url, service_id.as_str())