defer event bus initialization

keotl · May 28, 2023 · 92135b8 · 92135b8
1 parent 5a5eb69
commit 92135b8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/jivago/config/production_jivago_context.py b/jivago/config/production_jivago_context.py
@@ -91,9 +91,11 @@ def configure_service_locator(self):
         self.serviceLocator.bind(PartialContentHandler, PartialContentHandler)
         self.serviceLocator.bind(HttpStatusCodeResolver, HttpStatusCodeResolver)
         self.serviceLocator.bind(ObjectMapper, ObjectMapper)
-        self.serviceLocator.bind(EventBus, self.create_event_bus())
-        self.serviceLocator.bind(SynchronousEventBus, self.serviceLocator.get(EventBus))
-        self.serviceLocator.bind(AsyncEventBus, AsyncEventBus(self.serviceLocator.get(EventBus)))
+        eventBusScope = SingletonScopeCache("_JivagoDependenciesSingleton", [EventBus, SynchronousEventBus, AsyncEventBus])
+        self.serviceLocator.register_scope(eventBusScope)
+        self.serviceLocator.bind(EventBus, self.create_event_bus)
+        self.serviceLocator.bind(SynchronousEventBus, SynchronousEventBus)
+        self.serviceLocator.bind(AsyncEventBus, AsyncEventBus)
         self.serviceLocator.bind(RequestScopeCache, request_scope_cache)
 
         if not self.banner:

diff --git a/jivago/event/async_event_bus.py b/jivago/event/async_event_bus.py
@@ -2,11 +2,12 @@
 
 from jivago.event.event_bus import EventBus
 from jivago.event.synchronous_event_bus import SynchronousEventBus
-from jivago.lang.annotations import Override
+from jivago.lang.annotations import Inject, Override
 
 
 class AsyncEventBus(EventBus):
 
+    @Inject
     def __init__(self, event_bus: SynchronousEventBus, pool_size=2):
         self.event_bus = event_bus
         self.thread_pool = ThreadPoolExecutor(max_workers=pool_size)

diff --git a/jivago/event/synchronous_event_bus.py b/jivago/event/synchronous_event_bus.py
@@ -3,13 +3,14 @@
 
 from jivago.event.dispatch.message_dispatcher import MessageDispatcher
 from jivago.event.event_bus import EventBus
-from jivago.lang.annotations import Override
+from jivago.lang.annotations import Inject, Override
 from jivago.lang.stream import Stream
 
 
 class SynchronousEventBus(EventBus):
     LOGGER = logging.getLogger("EventBus")
 
+    @Inject
     def __init__(self, message_handlers: List[MessageDispatcher]):
         self.message_handlers = message_handlers