From 76130c4a7856d4cbd23c0d67ca4a269c6088dbd7 Mon Sep 17 00:00:00 2001 From: Ripp <31484824+loganripplinger@users.noreply.github.com> Date: Mon, 9 Dec 2019 09:55:48 -0800 Subject: [PATCH] fix: Do not halt when if a folder is in descriptor folder (#39) --- data_resource_api/app/data_model_manager.py | 2 +- data_resource_api/app/data_resource_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data_resource_api/app/data_model_manager.py b/data_resource_api/app/data_model_manager.py index 8e2f688..9fd4f6c 100644 --- a/data_resource_api/app/data_model_manager.py +++ b/data_resource_api/app/data_model_manager.py @@ -300,7 +300,7 @@ def monitor_data_models(self): if os.path.isdir(os.path.join(schema_dir, schema)): self.logger.exception( f"Cannot open a nested schema directory '{schema}'") - return + continue try: with open(os.path.join(schema_dir, schema), 'r') as fh: diff --git a/data_resource_api/app/data_resource_manager.py b/data_resource_api/app/data_resource_manager.py index ef9b625..d4609c0 100644 --- a/data_resource_api/app/data_resource_manager.py +++ b/data_resource_api/app/data_resource_manager.py @@ -222,7 +222,7 @@ def monitor_data_resources(self): schema_file = os.path.join(schema_dir, schema) if not os.path.isfile(schema_file): - return + continue with open(os.path.join(schema_dir, schema), 'r') as fh: schema_dict = json.load(fh)