diff --git a/cli/src/helpers.rs b/cli/src/helpers.rs index 235e007b7..b2ecd8f6e 100644 --- a/cli/src/helpers.rs +++ b/cli/src/helpers.rs @@ -34,7 +34,7 @@ pub fn gen_core_config(sub_matches: &ArgMatches) { let mongo_uri = sub_matches .get_one::("mongo_uri") .map(|p| p.as_str()) - .unwrap_or("mongodb://mongo") + .unwrap_or("mongodb://monitor-mongo") .to_string(); let mongo_db_name = sub_matches diff --git a/cli/src/main.rs b/cli/src/main.rs index 59903da69..6bdfe279d 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -31,7 +31,7 @@ fn cli() -> Command { .required(false) ) .arg( - arg!(--mongo_uri "sets the mongo uri to use. default is 'mongodb://mongo'") + arg!(--mongo_uri "sets the mongo uri to use. default is 'mongodb://monitor-mongo'") .required(false) ) .arg( diff --git a/core/src/config.rs b/core/src/config.rs index b78a5231f..46f2873df 100644 --- a/core/src/config.rs +++ b/core/src/config.rs @@ -13,14 +13,9 @@ pub fn load() -> CoreConfig { dotenv().ok(); let env: Env = envy::from_env().expect("failed to parse environment variables"); let config = parse_config_file(&env.config_path).expect("failed to parse config"); - print_startup_log(&config); config } -fn print_startup_log(config: &CoreConfig) { - println!("starting monitor core on port {}", config.port); -} - pub fn default_config_path() -> String { "/config/config.toml".to_string() } diff --git a/core/src/main.rs b/core/src/main.rs index 243be6944..9ca58535b 100644 --- a/core/src/main.rs +++ b/core/src/main.rs @@ -17,6 +17,8 @@ mod ws; async fn main() { let config = config::load(); + println!("starting monitor core on port {}...", config.port); + let app = Router::new() .nest("/api", api::router()) .nest("/auth", auth::router(&config)) @@ -24,6 +26,8 @@ async fn main() { .layer(JwtClient::extension(&config)) .layer(State::extension(config.clone()).await); + println!("started monitor core on port {}", config.port); + axum::Server::bind(&get_socket_addr(config.port)) .serve(app.into_make_service()) .await diff --git a/tests/src/main.rs b/tests/src/main.rs index 0304e1160..75ef05c60 100644 --- a/tests/src/main.rs +++ b/tests/src/main.rs @@ -17,16 +17,16 @@ async fn main() -> anyhow::Result<()> { let start_ts = unix_timestamp_ms(); - let (server, deployment, build) = create_test_setup(&monitor, "test").await?; + // let (server, deployment, build) = create_test_setup(&monitor, "test").await?; let server_stats = get_server_stats(&monitor).await?; println!("server stats:\n{server_stats:#?}\n"); - let (update, container) = deploy_mongo(&monitor).await?; - println!( - "mongo deploy update:\n{update:#?}\n\ncontainer: {:#?}\n", - container.container - ); + // let (update, container) = deploy_mongo(&monitor).await?; + // println!( + // "mongo deploy update:\n{update:#?}\n\ncontainer: {:#?}\n", + // container.container + // ); // let update = test_build(&monitor).await?; // println!("build update:\n{update:#?}");