From 54762f88493b1fac99735fe06f9b51f8faa9f800 Mon Sep 17 00:00:00 2001
From: Abhinav Singh <mailsforabhinav@gmail.com>
Date: Sun, 11 Aug 2024 12:23:36 +0530
Subject: [PATCH] Remove event queue prop

---
 proxy/proxy.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/proxy/proxy.py b/proxy/proxy.py
index 8bef1b457f..673c9b2ece 100644
--- a/proxy/proxy.py
+++ b/proxy/proxy.py
@@ -24,7 +24,7 @@
 
 from .core.ssh import SshTunnelListener, SshHttpProtocolHandler
 from .core.work import ThreadlessPool
-from .core.event import EventQueue, EventManager
+from .core.event import EventManager
 from .http.codes import httpStatusCodes
 from .common.flag import FlagParser, flags
 from .http.client import client
@@ -213,10 +213,6 @@ def __enter__(self) -> 'Proxy':
     def __exit__(self, *args: Any) -> None:
         self.shutdown()
 
-    @property
-    def event_queue(self) -> Optional[EventQueue]:
-        return self.event_manager.queue if self.event_manager is not None else None
-
     def setup(self) -> None:
         # TODO: Introduce cron feature
         # https://github.com/abhinavsingh/proxy.py/discussions/808
@@ -264,12 +260,15 @@ def setup(self) -> None:
             logger.info('Core Event enabled')
             self.event_manager = EventManager()
             self.event_manager.setup()
+        event_queue = (
+            self.event_manager.queue if self.event_manager is not None else None
+        )
         # Setup remote executors only if
         # --local-executor mode isn't enabled.
         if self.remote_executors_enabled:
             self.executors = ThreadlessPool(
                 flags=self.flags,
-                event_queue=self.event_queue,
+                event_queue=event_queue,
                 executor_klass=RemoteFdExecutor,
             )
             self.executors.setup()
@@ -280,7 +279,7 @@ def setup(self) -> None:
             executor_queues=self.executors.work_queues if self.executors else [],
             executor_pids=self.executors.work_pids if self.executors else [],
             executor_locks=self.executors.work_locks if self.executors else [],
-            event_queue=self.event_queue,
+            event_queue=event_queue,
         )
         self.acceptors.setup()
         # Start SSH tunnel acceptor if enabled
@@ -390,8 +389,11 @@ def sleep_loop(p: Optional[Proxy] = None) -> None:
 
 def main(**opts: Any) -> None:
     with Proxy(sys.argv[1:], **opts) as p:
-        if p.event_queue is not None and p.flags.enable_metrics:
-            with MetricsEventSubscriber(p.event_queue, p.flags.metrics_lock):
+        event_queue = event_queue = (
+            p.event_manager.queue if p.event_manager is not None else None
+        )
+        if event_queue is not None and p.flags.enable_metrics:
+            with MetricsEventSubscriber(event_queue, p.flags.metrics_lock):
                 sleep_loop(p)
         else:
             sleep_loop(p)