From 0e34741041dd0da7f83d8c08daa09665480dbff9 Mon Sep 17 00:00:00 2001 From: Jason Lubken Date: Tue, 2 Jun 2020 16:51:23 -0400 Subject: [PATCH] Update logging --- src/dsdk/mongo.py | 13 +++++++++---- src/dsdk/mssql.py | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/dsdk/mongo.py b/src/dsdk/mongo.py index d0ca934..f490f21 100644 --- a/src/dsdk/mongo.py +++ b/src/dsdk/mongo.py @@ -157,8 +157,13 @@ def store_evidence(self, batch: Batch, *args, **kwargs) -> None: df.drop(columns=["batch_id"], inplace=True) -OPEN = '{"key": "mongo.open", "database": "%s", "is_master": "%s" }' -CLOSE = '{"key": "mongo.close", "database": "%s"}' +OPEN = "".join( + ("{", ", ".join(('"key": "mongo.open"', '"database": "%s"',)), "}",) +) + +CLOSE = "".join( + ("{", ", ".join(('"key": "mongo.close"', '"database": "%s"',)), "}",) +) @contextmanager @@ -186,8 +191,8 @@ def open_database( ) as client: database = client.get_database() # force lazy connection open - is_master = client.admin.command("ismaster") - logger.info(OPEN, database.name, is_master) + client.admin.command("ismaster") + logger.info(OPEN, database.name) try: yield database finally: diff --git a/src/dsdk/mssql.py b/src/dsdk/mssql.py index 413b2a6..c889c6e 100644 --- a/src/dsdk/mssql.py +++ b/src/dsdk/mssql.py @@ -73,9 +73,9 @@ def _inject_mssql_uri(mssql_uri: str) -> str: type=_inject_mssql_uri, ) - OPEN = "".join(("{", ", ".join(('"key": "mssql.open"')), "}")) + OPEN = "".join(("{", ", ".join(('"key": "mssql.open"',)), "}")) - CLOSE = "".join(("{", ", ".join(('"key": "mssql.close"')), "}")) + CLOSE = "".join(("{", ", ".join(('"key": "mssql.close"',)), "}")) CONNECT = """ select 1 as n