Skip to content

Commit aa868a0

Browse files
committed
Log connected devices when using deviceManager
1 parent d89b366 commit aa868a0

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/blueapi/core/context.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ def with_device_manager(self, manager: DeviceManager, mock: bool = False):
273273
f"{len(errs)} errors while connecting devices",
274274
exc_info=NotConnectedError(errs),
275275
)
276+
utils.report_successful_devices(build_result.devices, mock)
276277
return build_result.devices, {
277278
**build_result.build_errors,
278279
**build_result.connection_errors,

src/blueapi/utils/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .base_model import BlueapiBaseModel, BlueapiModelConfig, BlueapiPlanModelConfig
2-
from .connect_devices import connect_devices
2+
from .connect_devices import connect_devices, report_successful_devices
33
from .file_permissions import get_owner_gid, is_sgid_set
44
from .invalid_config_error import InvalidConfigError
55
from .modules import is_function_sourced_from_module, load_module_all
@@ -15,6 +15,7 @@
1515
"BlueapiPlanModelConfig",
1616
"InvalidConfigError",
1717
"connect_devices",
18+
"report_successful_devices",
1819
"is_sgid_set",
1920
"get_owner_gid",
2021
"is_function_sourced_from_module",

src/blueapi/utils/connect_devices.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
LOGGER = logging.getLogger(__name__)
1616

1717

18-
def _report_successful_devices(
18+
def report_successful_devices(
1919
devices: Mapping[str, AnyDevice],
2020
sim_backend: bool,
2121
) -> None:
@@ -86,14 +86,14 @@ def is_simulated_device(name, factory, **kwargs):
8686
real_devices, exceptions = _establish_device_connections(
8787
run_engine, real_devices, False
8888
)
89-
_report_successful_devices(real_devices, False)
89+
report_successful_devices(real_devices, False)
9090
exception_map |= exceptions
9191
if len(sim_devices) > 0:
9292
sim_devices, exceptions = _establish_device_connections(
9393
run_engine,
9494
sim_devices, # type: ignore
9595
True,
9696
)
97-
_report_successful_devices(sim_devices, True)
97+
report_successful_devices(sim_devices, True)
9898
exception_map |= exceptions
9999
return exception_map

0 commit comments

Comments
 (0)