Fix startup race

bdraco · bdraco · commit 949c85cfd473 · 2021-06-18T21:17:39.000-10:00
diff --git a/zeroconf/_services/__init__.py b/zeroconf/_services/__init__.py
@@ -307,6 +307,8 @@ def __init__(
         for h in handlers:
             self.service_state_changed.register_handler(h)
 
+        self.zc.add_listener(self, [DNSQuestion(type_, _TYPE_PTR, _CLASS_IN) for type_ in self.types])
+
     @property
     def service_state_changed(self) -> SignalRegistrationInterface:
         return self._service_state_changed.registration_interface
@@ -406,11 +408,6 @@ def cancel(self) -> None:
         self.done = True
         self.zc.remove_listener(self)
 
-    def run(self) -> None:
-        """Run the browser."""
-        questions = [DNSQuestion(type_, _TYPE_PTR, _CLASS_IN) for type_ in self.types]
-        self.zc.add_listener(self, questions)
-
     def generate_ready_queries(self) -> List[DNSOutgoing]:
         """Generate the service browser query for any type that is due."""
         now = current_time_millis()
@@ -480,7 +477,6 @@ def cancel(self) -> None:
 
     def run(self) -> None:
         """Run the browser thread."""
-        super().run()
         while True:
             timeout = self._seconds_to_wait()
             if timeout:
diff --git a/zeroconf/aio.py b/zeroconf/aio.py
@@ -146,7 +146,6 @@ async def async_cancel(self) -> None:
 
     async def async_run(self) -> None:
         """Run the browser task."""
-        self.run()
         await self.aiozc.zeroconf.async_wait_for_start()
         while True:
             timeout = self._seconds_to_wait()
