Skip to content

Commit 28d0e57

Browse files
committed
removed redundant function and added try catch block
1 parent 9adf9aa commit 28d0e57

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

libp2p/discovery/mdns/broadcaster.py

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import socket
33

44
from zeroconf import (
5+
EventLoopBlocked,
56
ServiceInfo,
67
Zeroconf,
78
)
@@ -57,8 +58,34 @@ def _get_local_ip(self) -> str:
5758

5859
def register(self) -> None:
5960
"""Register the peer's mDNS service on the network."""
60-
self.zeroconf.register_service(self.service_info)
61+
try:
62+
self.zeroconf.register_service(self.service_info)
63+
logger.debug("mDNS service registered: %s", self.service_name)
64+
except EventLoopBlocked as e:
65+
logger.warning(
66+
"EventLoopBlocked while registering mDNS '%s': %s", self.service_name, e
67+
)
68+
except Exception as e:
69+
logger.error(
70+
"Unexpected error during mDNS registration for '%s': %r",
71+
self.service_name,
72+
e,
73+
)
6174

6275
def unregister(self) -> None:
6376
"""Unregister the peer's mDNS service from the network."""
64-
self.zeroconf.unregister_service(self.service_info)
77+
try:
78+
self.zeroconf.unregister_service(self.service_info)
79+
logger.debug("mDNS service unregistered: %s", self.service_name)
80+
except EventLoopBlocked as e:
81+
logger.warning(
82+
"EventLoopBlocked while unregistering mDNS '%s': %s",
83+
self.service_name,
84+
e,
85+
)
86+
except Exception as e:
87+
logger.error(
88+
"Unexpected error during mDNS unregistration for '%s': %r",
89+
self.service_name,
90+
e,
91+
)

libp2p/discovery/mdns/listener.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,6 @@ def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:
6161
self.peerstore.add_addrs(peer_info.peer_id, peer_info.addrs, 10)
6262
logger.debug("Updated Peer", peer_info.peer_id)
6363

64-
def _process_discovered_service(
65-
self, zeroconf: Zeroconf, type_: str, name: str
66-
) -> None:
67-
info = zeroconf.get_service_info(type_, name, timeout=5000)
68-
if not info:
69-
return
70-
peer_info = self._extract_peer_info(info)
71-
if peer_info:
72-
self.peerstore.add_addrs(peer_info.peer_id, peer_info.addrs, 10)
73-
logger.debug("Discovered:", peer_info.peer_id)
74-
7564
def _extract_peer_info(self, info: ServiceInfo) -> PeerInfo | None:
7665
try:
7766
addrs = [

0 commit comments

Comments
 (0)