From 62b01dea9c8d4b5f00ec187960017e974fdfd969 Mon Sep 17 00:00:00 2001 From: Patricia Grubel Date: Wed, 20 Mar 2024 14:55:06 -0600 Subject: [PATCH] Revert "add log.error() calls to wfi and neo4j_driver files" --- beeflow/common/gdb/gdb_driver.py | 3 --- beeflow/common/gdb/neo4j_cypher.py | 3 --- beeflow/common/gdb/neo4j_driver.py | 4 ---- beeflow/common/wf_interface.py | 5 ----- 4 files changed, 15 deletions(-) diff --git a/beeflow/common/gdb/gdb_driver.py b/beeflow/common/gdb/gdb_driver.py index 16d225590..2d372cbf4 100644 --- a/beeflow/common/gdb/gdb_driver.py +++ b/beeflow/common/gdb/gdb_driver.py @@ -1,9 +1,6 @@ """Abstract base class for the handling of workflow DAGs.""" from abc import ABC, abstractmethod -from beeflow.common import log as bee_logging - -log = bee_logging.setup(__name__) class GraphDatabaseDriver(ABC): diff --git a/beeflow/common/gdb/neo4j_cypher.py b/beeflow/common/gdb/neo4j_cypher.py index 8a48d0059..f8c8913a8 100644 --- a/beeflow/common/gdb/neo4j_cypher.py +++ b/beeflow/common/gdb/neo4j_cypher.py @@ -1,9 +1,6 @@ """Neo4j/Cypher transaction functions used by the Neo4jDriver class.""" from re import fullmatch -from beeflow.common import log as bee_logging - -log = bee_logging.setup(__name__) def create_workflow_node(tx, workflow): diff --git a/beeflow/common/gdb/neo4j_driver.py b/beeflow/common/gdb/neo4j_driver.py index 3b3222576..ba0d6f695 100644 --- a/beeflow/common/gdb/neo4j_driver.py +++ b/beeflow/common/gdb/neo4j_driver.py @@ -12,9 +12,6 @@ from beeflow.common.gdb import neo4j_cypher as tx from beeflow.common.wf_data import (Workflow, Task, Requirement, Hint, InputParameter, OutputParameter, StepInput, StepOutput) -from beeflow.common import log as bee_logging - -log = bee_logging.setup(__name__) # Default Neo4j authentication # We may want to instead get these from a config at some point @@ -54,7 +51,6 @@ def __init__(self, user=DEFAULT_USER, password=DEFAULT_PASSWORD, **kwargs): # Connect to the Neo4j database using the Neo4j proprietary driver self._driver = Neo4jDatabase.driver(uri, auth=(user, password)) except ServiceUnavailable as sue: - log.error("Neo4j database is unavailable") raise Neo4JNotRunning("Neo4j database is unavailable") from sue def initialize_workflow(self, workflow): diff --git a/beeflow/common/wf_interface.py b/beeflow/common/wf_interface.py index d34a790d5..f53f76725 100644 --- a/beeflow/common/wf_interface.py +++ b/beeflow/common/wf_interface.py @@ -4,9 +4,6 @@ """ import re -from beeflow.common import log as bee_logging - -log = bee_logging.setup(__name__) class WorkflowInterface: @@ -36,7 +33,6 @@ def initialize_workflow(self, workflow): :type workflow: Workflow """ if self.workflow_loaded(): - log.error("attempt to re-initialize existing workflow") raise RuntimeError("attempt to re-initialize existing workflow") if workflow.requirements is None: workflow.requirements = [] @@ -111,7 +107,6 @@ def restart_task(self, task, checkpoint_file): self.set_workflow_state("FAILED") return None else: - log.error("invalid task for checkpoint restart") raise ValueError("invalid task for checkpoint restart") new_task = task.copy(new_id=True)