change: Decouple service autostart from bootstrapping.

Author: defnull

bbblb/cli/__init__.py

@@ -163,7 +163,7 @@ async def main(ctx, obj, config_file, config, verbose):
 
     config_.populate()
     config_.set(WORKER=False)
-    ctx.obj = await bootstrap(config_, autostart=False, logging=False)
+    ctx.obj = await bootstrap(config_, logging=False)
 
 
 # Auto-load all modules in the bbblb.cli package to load all commands.

bbblb/services/__init__.py

@@ -285,9 +285,7 @@ def configure_logging(config: BBBLBConfig):
         )
 
 
-async def bootstrap(
-    config: BBBLBConfig, autostart=True, logging=True
-) -> ServiceRegistry:
+async def bootstrap(config: BBBLBConfig, logging=True) -> ServiceRegistry:
     import bbblb.services.poller
     import bbblb.services.recording
     import bbblb.services.analytics
@@ -317,9 +315,6 @@ def watch_debug_level(name, old, new):
     ctx.register(bbblb.services.analytics.AnalyticsHandler)
     ctx.register(bbblb.services.tenants.TenantCache)
 
-    if autostart:
-        await ctx.start_all()
-
     LOG.debug("Bootstrapping completed!")
 
     return ctx

bbblb/web/__init__.py

@@ -39,7 +39,7 @@ def services(self) -> ServiceRegistry:
 
     @cached_property
     def config(self) -> BBBLBConfig:
-        return cast(BBBLBConfig, self.request.app.state.config)
+        return self.services.get(BBBLBConfig)
 
     @cached_property
     def bbb(self) -> BBBHelper:
@@ -135,8 +135,10 @@ def make_app(config: BBBLBConfig | None = None, autostart=True):
 
     @asynccontextmanager
     async def lifespan(app: Starlette):
-        services = await bbblb.services.bootstrap(config, autostart=autostart)
+        services = await bbblb.services.bootstrap(config)
         async with services:
+            if autostart:
+                await services.start_all()
             app.state.config = config
             app.state.services = services
             yield

tests/conftest.py

@@ -51,7 +51,7 @@ def config(db_url, tmp_path):
 
 @pytest_asyncio.fixture(scope="function")
 async def services(config: bbblb.settings.BBBLBConfig):
-    services = await bbblb.services.bootstrap(config, autostart=False)
+    services = await bbblb.services.bootstrap(config)
     async with services:
         yield services