From f92fa8b4b50265865cd29fd754082553ac1b03b1 Mon Sep 17 00:00:00 2001 From: Shabaz Patel Date: Mon, 5 Nov 2018 10:57:53 -0800 Subject: [PATCH] updating the order of key selection --- datmo/config.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/datmo/config.py b/datmo/config.py index ca531d8b..54c34934 100644 --- a/datmo/config.py +++ b/datmo/config.py @@ -52,23 +52,23 @@ def remote_credentials(self): END_POINT : str return if present else None """ - # 1) loading the datmo config if present + # 1) Load from the environment if datmo config not already saved globally + MASTER_SERVER_IP = os.environ.get('MASTER_SERVER_IP', None) + DATMO_API_KEY = os.environ.get('DATMO_API_KEY', None) + + # 2) loading the datmo config if present datmo_config_filepath = os.path.join( os.path.expanduser("~"), ".datmo", "config") if os.path.isfile(datmo_config_filepath): datmo_config = JSONStore(datmo_config_filepath) config_dict = datmo_config.to_dict() - MASTER_SERVER_IP = config_dict.get('MASTER_SERVER_IP', None) - DATMO_API_KEY = config_dict.get('DATMO_API_KEY', None) + if MASTER_SERVER_IP is None: + MASTER_SERVER_IP = config_dict.get('MASTER_SERVER_IP', None) + if DATMO_API_KEY is None: + DATMO_API_KEY = config_dict.get('DATMO_API_KEY', None) else: MASTER_SERVER_IP, DATMO_API_KEY = None, None - # 2) Load from the environment if datmo config not already saved globally - if not MASTER_SERVER_IP: - MASTER_SERVER_IP = os.environ.get('MASTER_SERVER_IP', None) - if not DATMO_API_KEY: - DATMO_API_KEY = os.environ.get('DATMO_API_KEY', None) - if MASTER_SERVER_IP: END_POINT = 'http://' + MASTER_SERVER_IP + ':2083/api/v1' else: