feat: update launcher (#1190)

blockscout · Jan 16, 2025 · 3ac9636 · 3ac9636
1 parent 3aecd8a
commit 3ac9636
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/multichain-aggregator/Cargo.lock b/multichain-aggregator/Cargo.lock
diff --git a/multichain-aggregator/Cargo.toml b/multichain-aggregator/Cargo.toml
@@ -21,7 +21,7 @@ actix-prost-build = { git = "https://github.com/blockscout/actix-prost", tag = "
 ] }
 actix-prost-macros = { git = "https://github.com/blockscout/actix-prost", tag = "v1.0.2" }
 actix-web = "4.2"
-blockscout-service-launcher = { version = "0.14.0", features = [
+blockscout-service-launcher = { version = "0.16.1", features = [
     "database-1_0",
 ] }
 prost = "0.11"

diff --git a/multichain-aggregator/multichain-aggregator-server/src/server.rs b/multichain-aggregator/multichain-aggregator-server/src/server.rs
@@ -52,14 +52,7 @@ pub async fn run(settings: Settings) -> Result<(), anyhow::Error> {
 
     let health = Arc::new(HealthService::default());
 
-    let mut connect_options = sea_orm::ConnectOptions::new(settings.database.connect.clone().url());
-    connect_options.sqlx_logging_level(tracing::log::LevelFilter::Debug);
-    let db = database::initialize_postgres::<Migrator>(
-        connect_options,
-        settings.database.create_database,
-        settings.database.run_migrations,
-    )
-    .await?;
+    let db = database::initialize_postgres::<Migrator>(&settings.database).await?;
 
     // Initialize/update Blockscout chains
     let blockscout_chains = BlockscoutChainsClient::builder()

diff --git a/multichain-aggregator/multichain-aggregator-server/src/settings.rs b/multichain-aggregator/multichain-aggregator-server/src/settings.rs
@@ -74,6 +74,7 @@ impl Settings {
             jaeger: Default::default(),
             database: DatabaseSettings {
                 connect: DatabaseConnectSettings::Url(database_url),
+                connect_options: Default::default(),
                 create_database: Default::default(),
                 run_migrations: Default::default(),
             },