From 393ea6a7bb6a3c824190e474c8cb281e88ce0cd7 Mon Sep 17 00:00:00 2001 From: David Duarte Date: Tue, 12 Sep 2023 22:04:27 +0000 Subject: [PATCH] pandora_server: Load server config Pandora server has it's own config that we load from the 'server' property of the current bumble config file --- apps/pandora_server.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/pandora_server.py b/apps/pandora_server.py index b577f823..16bc2112 100644 --- a/apps/pandora_server.py +++ b/apps/pandora_server.py @@ -3,7 +3,7 @@ import click import logging import json -from bumble.pandora import PandoraDevice, serve +from bumble.pandora import PandoraDevice, Config, serve from typing import Dict, Any BUMBLE_SERVER_GRPC_PORT = 7999 @@ -29,12 +29,14 @@ def main(grpc_port: int, rootcanal_port: int, transport: str, config: str) -> No transport = transport.replace('', str(rootcanal_port)) bumble_config = retrieve_config(config) - if 'transport' not in bumble_config.keys(): - bumble_config.update({'transport': transport}) + bumble_config.setdefault('transport', transport) device = PandoraDevice(bumble_config) + server_config = Config() + server_config.load_from_dict(bumble_config.get('server', {})) + logging.basicConfig(level=logging.DEBUG) - asyncio.run(serve(device, port=grpc_port)) + asyncio.run(serve(device, config=server_config, port=grpc_port)) def retrieve_config(config: str) -> Dict[str, Any]: