fixup: first comment batch

OpenRailAssociation · Apr 10, 2024 · bec8381 · bec8381
1 parent 15ded2e
commit bec8381
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/core_controller/src/config.rs b/core_controller/src/config.rs
@@ -32,17 +32,12 @@ pub struct Config {
 
 impl Default for Config {
     fn default() -> Config {
-        // if env DEFAULT_CC_RMQ_HOST is not set, use rabbitmq (container name) otherwise use the env value
+        // if env DEFAULT_CC_*_HOST are not set, use rabbitmq (container name) otherwise use the env value
         // Used for local development, making easier to seperate host mode to docker network mode
-        let default_rmq_host = match std::env::var("DEFAULT_CC_RMQ_HOST") {
-            Ok(val) => val,
-            Err(_) => "rabbitmq".to_string(),
-        };
-
-        let default_redis_host: String = match std::env::var("DEFAULT_CC_REDIS_HOST") {
-            Ok(val) => val,
-            Err(_) => "redis".to_string(),
-        };
+        let default_rmq_host =
+            std::env::var("DEFAULT_CC_RMQ_HOST").unwrap_or("rabbitmq".to_string());
+        let default_redis_host: String =
+            std::env::var("DEFAULT_CC_REDIS_HOST").unwrap_or("redis".to_string());
 
         Config {
             loop_interval: 3,

diff --git a/core_controller/src/control_loop.rs b/core_controller/src/control_loop.rs
@@ -86,7 +86,7 @@ impl ControlLoop {
         for core in cores {
             let last_seen: Option<i64> = redis::cmd("GET")
                 .arg(format!(
-                    "{}/{}",
+                    "{}.{}",
                     &self.config.redis.core_last_seen_prefix, core.infra_id
                 ))
                 .query_async(&mut redis_conn)