@@ -32,17 +32,12 @@ pub struct Config {
32
32
33
33
impl Default for Config {
34
34
fn default ( ) -> Config {
35
- // if env DEFAULT_CC_RMQ_HOST is not set, use rabbitmq (container name) otherwise use the env value
35
+ // if env DEFAULT_CC_*_HOST are not set, use rabbitmq (container name) otherwise use the env value
36
36
// Used for local development, making easier to seperate host mode to docker network mode
37
- let default_rmq_host = match std:: env:: var ( "DEFAULT_CC_RMQ_HOST" ) {
38
- Ok ( val) => val,
39
- Err ( _) => "rabbitmq" . to_string ( ) ,
40
- } ;
41
-
42
- let default_redis_host: String = match std:: env:: var ( "DEFAULT_CC_REDIS_HOST" ) {
43
- Ok ( val) => val,
44
- Err ( _) => "redis" . to_string ( ) ,
45
- } ;
37
+ let default_rmq_host =
38
+ std:: env:: var ( "DEFAULT_CC_RMQ_HOST" ) . unwrap_or ( "rabbitmq" . to_string ( ) ) ;
39
+ let default_redis_host: String =
40
+ std:: env:: var ( "DEFAULT_CC_REDIS_HOST" ) . unwrap_or ( "redis" . to_string ( ) ) ;
46
41
47
42
Config {
48
43
loop_interval : 3 ,
@@ -53,7 +48,8 @@ impl Default for Config {
53
48
core_last_seen_prefix : "core/last_seen_msg" . to_string ( ) ,
54
49
} ,
55
50
provider : Provider :: Docker ( DockerDriverOptions {
56
- core_image_name : "ghcr.io/osrd-project/edge/osrd-core" . to_string ( ) ,
51
+ core_image_name : "ghcr.io/openrail/openrailassociation/osrd-edge/osrd-core"
52
+ . to_string ( ) ,
57
53
core_image_tag : "dev" . to_string ( ) ,
58
54
container_prefix : "dyn-osrd" . to_string ( ) ,
59
55
default_env : vec ! [ ] ,
0 commit comments