some consistency fixes

This commit is contained in:
mbecker20
2022-12-18 00:14:46 +00:00
parent c0854c7923
commit 6284a48a3a
5 changed files with 12 additions and 13 deletions

View File

@@ -34,7 +34,7 @@ pub fn gen_core_config(sub_matches: &ArgMatches) {
let mongo_uri = sub_matches
.get_one::<String>("mongo_uri")
.map(|p| p.as_str())
.unwrap_or("mongodb://mongo")
.unwrap_or("mongodb://monitor-mongo")
.to_string();
let mongo_db_name = sub_matches

View File

@@ -31,7 +31,7 @@ fn cli() -> Command {
.required(false)
)
.arg(
arg!(--mongo_uri <URI> "sets the mongo uri to use. default is 'mongodb://mongo'")
arg!(--mongo_uri <URI> "sets the mongo uri to use. default is 'mongodb://monitor-mongo'")
.required(false)
)
.arg(

View File

@@ -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()
}

View File

@@ -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

View File

@@ -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:#?}");