From 058ed8b0096c048c9673868ff936a15f6de345ce Mon Sep 17 00:00:00 2001 From: Marina Galvagni Date: Wed, 25 Oct 2023 16:43:40 -0400 Subject: [PATCH 1/2] Change logging default value to be error --- codegen/adr_utils.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codegen/adr_utils.txt b/codegen/adr_utils.txt index bf6525418..7303ff1c3 100644 --- a/codegen/adr_utils.txt +++ b/codegen/adr_utils.txt @@ -60,7 +60,7 @@ def get_logger(logfile=None): The logger object. """ logger = logging.getLogger() - logger.setLevel(logging.DEBUG) + logger.setLevel(logging.ERROR) if logfile is None: # Logging for Python APIs should be disabled by default ch = logging.NullHandler() @@ -68,7 +68,7 @@ def get_logger(logfile=None): ch = logging.StreamHandler(sys.stdout) else: ch = logging.FileHandler(logfile) - ch.setLevel(logging.DEBUG) + ch.setLevel(logging.ERROR) formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") ch.setFormatter(formatter) logger.addHandler(ch) From d7393ee47c8f354c609ca1735cc3e8341c6e30db Mon Sep 17 00:00:00 2001 From: Marina Galvagni Date: Mon, 30 Oct 2023 12:59:27 -0400 Subject: [PATCH 2/2] Fix logger level and error message on stop method --- src/ansys/dynamicreporting/core/adr_service.py | 4 ++-- tests/test_service.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ansys/dynamicreporting/core/adr_service.py b/src/ansys/dynamicreporting/core/adr_service.py index e2895a172..558a1e586 100755 --- a/src/ansys/dynamicreporting/core/adr_service.py +++ b/src/ansys/dynamicreporting/core/adr_service.py @@ -544,7 +544,7 @@ def stop(self) -> None: except Exception: pass if v is False: - self.logger.warning("Error validating the connected service. Can't shut it down.\n") + self.logger.error("Error validating the connected service. Can't shut it down.\n") else: # If coming from a docker image, clean that up try: @@ -556,7 +556,7 @@ def stop(self) -> None: self.logger.info("Told service to shutdown.\n") self.serverobj.stop_local_server() except Exception as e: - self.logger.warning(f"Problem shutting down service.\n{str(e)}\n") + self.logger.error(f"Problem shutting down service.\n{str(e)}\n") pass if self._delete_db and self._db_directory: diff --git a/tests/test_service.py b/tests/test_service.py index e9263accf..37a34cd3d 100755 --- a/tests/test_service.py +++ b/tests/test_service.py @@ -64,7 +64,7 @@ def test_unit_nexus_stop(request) -> bool: a = Service(logfile=logfile) a.stop() f = open(logfile) - assert "There is no service connected to the current session" in f.read() + assert "Error validating the connected service" in f.read() @pytest.mark.ado_test