jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 15:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve bluetooth logging when there are multiple adapters (#77007)

Browse Source
This commit is contained in:
J. Nick Koston 2022-08-20 07:22:42 -10:00 committed by GitHub
parent 49957c752b
commit 18246bb8c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/bluetooth/__init__.py
View File

@ -269,13 +269,17 @@ async def async_setup_entry(
assert address is not None assert address is not None
adapter = await manager.async_get_adapter_from_address(address) adapter = await manager.async_get_adapter_from_address(address)
if adapter is None: if adapter is None:
raise ConfigEntryNotReady(f"Bluetooth adapter with address {address} not found") raise ConfigEntryNotReady(
f"Bluetooth adapter {adapter} with address {address} not found"
)
try: try:
bleak_scanner = create_bleak_scanner(BluetoothScanningMode.ACTIVE, adapter) bleak_scanner = create_bleak_scanner(BluetoothScanningMode.ACTIVE, adapter)
except RuntimeError as err: except RuntimeError as err:
raise ConfigEntryNotReady from err raise ConfigEntryNotReady(
scanner = HaScanner(hass, bleak_scanner, adapter) f"{adapter_human_name(adapter, address)}: {err}"
) from err
scanner = HaScanner(hass, bleak_scanner, adapter, address)
entry.async_on_unload(scanner.async_register_callback(manager.scanner_adv_received)) entry.async_on_unload(scanner.async_register_callback(manager.scanner_adv_received))
await scanner.async_start() await scanner.async_start()
entry.async_on_unload(manager.async_register_scanner(scanner)) entry.async_on_unload(manager.async_register_scanner(scanner))

9
homeassistant/components/bluetooth/scanner.py
View File

@ -33,6 +33,7 @@ from .const import (
START_TIMEOUT, START_TIMEOUT,
) )
from .models import BluetoothScanningMode from .models import BluetoothScanningMode
from .util import adapter_human_name
OriginalBleakScanner = bleak.BleakScanner OriginalBleakScanner = bleak.BleakScanner
MONOTONIC_TIME = time.monotonic MONOTONIC_TIME = time.monotonic
@ -76,7 +77,11 @@ class HaScanner:
""" """
def __init__( def __init__(
self, hass: HomeAssistant, scanner: bleak.BleakScanner, adapter: str | None self,
hass: HomeAssistant,
scanner: bleak.BleakScanner,
adapter: str,
address: str,
) -> None: ) -> None:
"""Init bluetooth discovery.""" """Init bluetooth discovery."""
self.hass = hass self.hass = hass
@ -89,7 +94,7 @@ class HaScanner:
self._callbacks: list[ self._callbacks: list[
Callable[[BLEDevice, AdvertisementData, float, str], None] Callable[[BLEDevice, AdvertisementData, float, str], None]
] = [] ] = []
self.name = self.adapter or "default" self.name = adapter_human_name(adapter, address)
self.source = self.adapter or SOURCE_LOCAL self.source = self.adapter or SOURCE_LOCAL
@property @property