From cccbde0fdd362a98132a5f0ec4e4da8c3801f7d3 Mon Sep 17 00:00:00 2001 From: jacob50231 Date: Tue, 25 Mar 2025 10:07:00 -0500 Subject: [PATCH 01/13] Add a line logging the name of the current indexd driver --- indexd/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indexd/app.py b/indexd/app.py index 73f4c6f8..89ec478f 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -50,6 +50,8 @@ def app_init(app, settings=None): app.register_blueprint(indexd_guid_blueprint) app.register_blueprint(cross_blueprint) app.register_blueprint(index_urls_blueprint, url_prefix="/_query/urls") + engine_name = settings["config"]["INDEX"]["driver"].engine.dialect.name + logger.info(f"Current IndexD Driver: {engine_name}") def get_app(settings=None): From 6d5d727dc799333d7b08a3aa688dde34d8890301 Mon Sep 17 00:00:00 2001 From: BinamB Date: Wed, 9 Apr 2025 12:11:17 -0500 Subject: [PATCH 02/13] add log line --- indexd/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indexd/app.py b/indexd/app.py index 89ec478f..47093f12 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -51,6 +51,8 @@ def app_init(app, settings=None): app.register_blueprint(cross_blueprint) app.register_blueprint(index_urls_blueprint, url_prefix="/_query/urls") engine_name = settings["config"]["INDEX"]["driver"].engine.dialect.name + + logger.info("------------Current IndexD Driver--------------") logger.info(f"Current IndexD Driver: {engine_name}") From c2816c7056b1aab8986532715a397bd759524738 Mon Sep 17 00:00:00 2001 From: BinamB Date: Wed, 9 Apr 2025 14:04:11 -0500 Subject: [PATCH 03/13] try logs --- indexd/app.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indexd/app.py b/indexd/app.py index 47093f12..8d6364c2 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -52,12 +52,10 @@ def app_init(app, settings=None): app.register_blueprint(index_urls_blueprint, url_prefix="/_query/urls") engine_name = settings["config"]["INDEX"]["driver"].engine.dialect.name - logger.info("------------Current IndexD Driver--------------") - logger.info(f"Current IndexD Driver: {engine_name}") - def get_app(settings=None): app = flask.Flask("indexd") + logger.info("------------Current IndexD Driver--------------") if "INDEXD_SETTINGS" in os.environ: sys.path.append(os.environ["INDEXD_SETTINGS"]) From 2b028ea6b82542d36f078c3b4787f78d052f4f3c Mon Sep 17 00:00:00 2001 From: BinamB Date: Mon, 14 Apr 2025 09:28:59 -0500 Subject: [PATCH 04/13] app_init logs --- indexd/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexd/app.py b/indexd/app.py index 8d6364c2..8d6aa3b9 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -21,6 +21,7 @@ def app_init(app, settings=None): + logger.info("------------Current IndexD Driver--------------") app.url_map.strict_slashes = False if not settings: from .default_settings import settings @@ -55,7 +56,6 @@ def app_init(app, settings=None): def get_app(settings=None): app = flask.Flask("indexd") - logger.info("------------Current IndexD Driver--------------") if "INDEXD_SETTINGS" in os.environ: sys.path.append(os.environ["INDEXD_SETTINGS"]) From cc0c0dab9c3440b85c325fd6e5df22160f37dc94 Mon Sep 17 00:00:00 2001 From: BinamB Date: Mon, 14 Apr 2025 10:17:39 -0500 Subject: [PATCH 05/13] per driver --- indexd/app.py | 2 +- indexd/index/drivers/alchemy.py | 1 + indexd/index/drivers/single_table_alchemy.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/indexd/app.py b/indexd/app.py index 8d6aa3b9..be6bcaa6 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -21,7 +21,7 @@ def app_init(app, settings=None): - logger.info("------------Current IndexD Driver--------------") + print("------------Current IndexD Driver--------------") app.url_map.strict_slashes = False if not settings: from .default_settings import settings diff --git a/indexd/index/drivers/alchemy.py b/indexd/index/drivers/alchemy.py index d9f36a46..d46f627d 100644 --- a/indexd/index/drivers/alchemy.py +++ b/indexd/index/drivers/alchemy.py @@ -341,6 +341,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): self.config = index_config or {} Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) + self.logger("------------SingleTable IndexD Driver--------------") def migrate_index_database(self): """ diff --git a/indexd/index/drivers/single_table_alchemy.py b/indexd/index/drivers/single_table_alchemy.py index f3652b52..1e0f0ec6 100644 --- a/indexd/index/drivers/single_table_alchemy.py +++ b/indexd/index/drivers/single_table_alchemy.py @@ -116,6 +116,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): self.config = index_config or {} Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) + self.logger("------------SingleTable IndexD Driver--------------") @property @contextmanager From fa79e2eab96d843f1e31d3f34a1d8072adea72f3 Mon Sep 17 00:00:00 2001 From: BinamB Date: Mon, 14 Apr 2025 10:30:36 -0500 Subject: [PATCH 06/13] Add info --- indexd/index/drivers/alchemy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexd/index/drivers/alchemy.py b/indexd/index/drivers/alchemy.py index d46f627d..b70efeba 100644 --- a/indexd/index/drivers/alchemy.py +++ b/indexd/index/drivers/alchemy.py @@ -341,7 +341,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): self.config = index_config or {} Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) - self.logger("------------SingleTable IndexD Driver--------------") + self.logger.info("------------SingleTable IndexD Driver--------------") def migrate_index_database(self): """ From 43a82386c690549505eeb8f1a2c2362ee30781f9 Mon Sep 17 00:00:00 2001 From: BinamB Date: Mon, 14 Apr 2025 10:30:47 -0500 Subject: [PATCH 07/13] add info --- indexd/index/drivers/single_table_alchemy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexd/index/drivers/single_table_alchemy.py b/indexd/index/drivers/single_table_alchemy.py index 1e0f0ec6..d527c801 100644 --- a/indexd/index/drivers/single_table_alchemy.py +++ b/indexd/index/drivers/single_table_alchemy.py @@ -116,7 +116,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): self.config = index_config or {} Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) - self.logger("------------SingleTable IndexD Driver--------------") + self.logger.info("------------SingleTable IndexD Driver--------------") @property @contextmanager From f52451f3e3681e88edfd9a5435bb4c6dc4a342ec Mon Sep 17 00:00:00 2001 From: BinamB Date: Mon, 14 Apr 2025 12:58:13 -0500 Subject: [PATCH 08/13] logger --- indexd/app.py | 3 ++- indexd/index/drivers/alchemy.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indexd/app.py b/indexd/app.py index be6bcaa6..032f10e0 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -17,11 +17,12 @@ from .blueprint import blueprint as cross_blueprint from indexd.urls.blueprint import blueprint as index_urls_blueprint +print(__name__) logger = cdislogging.get_logger(__name__) def app_init(app, settings=None): - print("------------Current IndexD Driver--------------") + logger.info("------------Current IndexD Driver--------------") app.url_map.strict_slashes = False if not settings: from .default_settings import settings diff --git a/indexd/index/drivers/alchemy.py b/indexd/index/drivers/alchemy.py index b70efeba..642a73dc 100644 --- a/indexd/index/drivers/alchemy.py +++ b/indexd/index/drivers/alchemy.py @@ -341,7 +341,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): self.config = index_config or {} Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) - self.logger.info("------------SingleTable IndexD Driver--------------") + self.logger.info("------------MultiTable IndexD Driver--------------") def migrate_index_database(self): """ From e629e30a42eb505662a9337d50057cce9102bbfb Mon Sep 17 00:00:00 2001 From: BinamB Date: Mon, 14 Apr 2025 13:44:58 -0500 Subject: [PATCH 09/13] logger --- indexd/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indexd/app.py b/indexd/app.py index 032f10e0..114955d3 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -55,7 +55,7 @@ def app_init(app, settings=None): engine_name = settings["config"]["INDEX"]["driver"].engine.dialect.name -def get_app(settings=None): +def get_app(settings=None, logger=logger): app = flask.Flask("indexd") if "INDEXD_SETTINGS" in os.environ: @@ -67,6 +67,6 @@ def get_app(settings=None): except ImportError: pass - app_init(app, settings) + app_init(app, settings, logger=logger) return app From d7e33df8d2457504d4c7df32c8a2b512db638e91 Mon Sep 17 00:00:00 2001 From: BinamB Date: Tue, 15 Apr 2025 09:57:10 -0500 Subject: [PATCH 10/13] logger --- indexd/app.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/indexd/app.py b/indexd/app.py index 114955d3..cd9baaf8 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -17,12 +17,11 @@ from .blueprint import blueprint as cross_blueprint from indexd.urls.blueprint import blueprint as index_urls_blueprint -print(__name__) logger = cdislogging.get_logger(__name__) +logger.info("------------Current IndexD Driver--------------") def app_init(app, settings=None): - logger.info("------------Current IndexD Driver--------------") app.url_map.strict_slashes = False if not settings: from .default_settings import settings @@ -55,7 +54,7 @@ def app_init(app, settings=None): engine_name = settings["config"]["INDEX"]["driver"].engine.dialect.name -def get_app(settings=None, logger=logger): +def get_app(settings=None): app = flask.Flask("indexd") if "INDEXD_SETTINGS" in os.environ: @@ -67,6 +66,6 @@ def get_app(settings=None, logger=logger): except ImportError: pass - app_init(app, settings, logger=logger) + app_init(app, settings) return app From fc77d3579774c4b7173c5832047d707825fcece0 Mon Sep 17 00:00:00 2001 From: BinamB Date: Tue, 15 Apr 2025 10:30:09 -0500 Subject: [PATCH 11/13] setlevel --- indexd/app.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indexd/app.py b/indexd/app.py index cd9baaf8..89d30207 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -4,6 +4,7 @@ from alembic.config import main as alembic_main import cdislogging import flask +import logging from indexd.index.drivers.alchemy import Base as IndexBase from indexd.alias.drivers.alchemy import Base as AliasBase @@ -18,10 +19,12 @@ from indexd.urls.blueprint import blueprint as index_urls_blueprint logger = cdislogging.get_logger(__name__) -logger.info("------------Current IndexD Driver--------------") +logger.setLevel(logging.INFO) def app_init(app, settings=None): + logger.info("------------Current IndexD Driver--------------") + app.url_map.strict_slashes = False if not settings: from .default_settings import settings From ae85be90b5988388e25662533ea47860bce9028b Mon Sep 17 00:00:00 2001 From: BinamB Date: Tue, 15 Apr 2025 10:40:39 -0500 Subject: [PATCH 12/13] log name --- indexd/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexd/app.py b/indexd/app.py index 89d30207..7d5a6c7c 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -18,7 +18,7 @@ from .blueprint import blueprint as cross_blueprint from indexd.urls.blueprint import blueprint as index_urls_blueprint -logger = cdislogging.get_logger(__name__) +logger = cdislogging.get_logger("indexd.init") logger.setLevel(logging.INFO) From 64acdded360c5f0b188c94fe2766f77723892600 Mon Sep 17 00:00:00 2001 From: BinamB Date: Tue, 15 Apr 2025 12:53:02 -0500 Subject: [PATCH 13/13] print --- indexd/app.py | 6 +----- indexd/index/drivers/alchemy.py | 1 + indexd/index/drivers/single_table_alchemy.py | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/indexd/app.py b/indexd/app.py index 7d5a6c7c..bc3c9c21 100644 --- a/indexd/app.py +++ b/indexd/app.py @@ -4,7 +4,6 @@ from alembic.config import main as alembic_main import cdislogging import flask -import logging from indexd.index.drivers.alchemy import Base as IndexBase from indexd.alias.drivers.alchemy import Base as AliasBase @@ -18,13 +17,10 @@ from .blueprint import blueprint as cross_blueprint from indexd.urls.blueprint import blueprint as index_urls_blueprint -logger = cdislogging.get_logger("indexd.init") -logger.setLevel(logging.INFO) +logger = cdislogging.get_logger(__name__) def app_init(app, settings=None): - logger.info("------------Current IndexD Driver--------------") - app.url_map.strict_slashes = False if not settings: from .default_settings import settings diff --git a/indexd/index/drivers/alchemy.py b/indexd/index/drivers/alchemy.py index 642a73dc..14532a1a 100644 --- a/indexd/index/drivers/alchemy.py +++ b/indexd/index/drivers/alchemy.py @@ -342,6 +342,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) self.logger.info("------------MultiTable IndexD Driver--------------") + print("------------MultiTable IndexD Driver--------------") def migrate_index_database(self): """ diff --git a/indexd/index/drivers/single_table_alchemy.py b/indexd/index/drivers/single_table_alchemy.py index d527c801..9405a7bf 100644 --- a/indexd/index/drivers/single_table_alchemy.py +++ b/indexd/index/drivers/single_table_alchemy.py @@ -117,6 +117,7 @@ def __init__(self, conn, logger=None, index_config=None, **config): Base.metadata.bind = self.engine self.Session = sessionmaker(bind=self.engine) self.logger.info("------------SingleTable IndexD Driver--------------") + print("------------SingleTable IndexD Driver--------------") @property @contextmanager @@ -488,7 +489,7 @@ def add( 'guid "{guid}" already exists'.format(guid=record.guid) ) except Exception as e: - print(e) + self.logger.error(f"Error adding indexd records: {e}") return record.guid, record.rev, record.baseid