squashme: minor fix

Author: olevski

bases/renku_data_services/data_api/main.py

@@ -115,13 +115,13 @@ async def handle_head(request: Request, response: BaseHTTPResponse) -> None:
         if request.method == "HEAD":
             response.body = None
 
-    @app.main_process_start
+    @app.before_server_start
     async def do_migrations(_: Sanic) -> None:
         logger.info("running migrations")
         run_migrations_for_app("common")
         await config.rp_repo.initialize(config.db.conn_url(async_client=False), config.default_resource_pool)
 
-    @app.main_process_start
+    @app.before_server_start
     async def do_solr_migrations(app: Sanic) -> None:
         logger.info(f"Running SOLR migrations at: {config.solr_config}")
         migrator = SchemaMigrator(config.solr_config)
@@ -137,7 +137,7 @@ async def setup_rclone_validator(app: Sanic) -> None:
         validator = RCloneValidator()
         app.ext.dependency(validator)
 
-    @app.main_process_ready
+    @app.after_server_start
     async def do_solr_reindex(app: Sanic) -> None:
         """Reindex solr if needed."""
         if not getattr(app.ctx, "solr_reindex", False):

bases/renku_data_services/data_api/prometheus.py

@@ -44,7 +44,8 @@ async def collect_system_metrics(app: Sanic, name: str) -> None:
 async def collect_system_metrics_task(app: Sanic) -> None:
     """Background task to collect metrics."""
     while True:
-        await collect_system_metrics(app, app.m.name)
+        name = app.name if not hasattr(app.multiplexer) else app.multiplexer.name
+        await collect_system_metrics(app, name)
         await asyncio.sleep(5)