From 89b2d9b837852520748cec022eb945cc5fd084f1 Mon Sep 17 00:00:00 2001 From: todd Date: Wed, 14 Dec 2022 06:28:19 -0700 Subject: [PATCH] Raise (and handle) exception if broker account is not in config --- sysbrokers/IB/ib_connection.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sysbrokers/IB/ib_connection.py b/sysbrokers/IB/ib_connection.py index b58e424d2c..0f8f57d428 100644 --- a/sysbrokers/IB/ib_connection.py +++ b/sysbrokers/IB/ib_connection.py @@ -8,7 +8,8 @@ from ib_insync import IB from sysbrokers.IB.ib_connection_defaults import ib_defaults -from syscore.objects import missing_data, arg_not_supplied +from syscore.exceptions import missingData +from syscore.objects import arg_not_supplied from syslogdiag.log_to_screen import logtoscreen @@ -57,12 +58,11 @@ def __init__( ib = IB() - if account is arg_not_supplied: - ## not passed get from config - account = get_broker_account() - - ## that may still return missing data... - if account is missing_data: + try: + if account is arg_not_supplied: + ## not passed get from config + account = get_broker_account() + except missingData: self.log.error( "Broker account ID not found in private config - may cause issues" ) @@ -108,5 +108,5 @@ def close_connection(self): def get_broker_account() -> str: production_config = get_production_config() - account_id = production_config.get_element_or_missing_data("broker_account") + account_id = production_config.get_element("broker_account") return account_id