Forráskód Böngészése

refactor: clean up logger usage

Sam Jaffe 1 hónapja
szülő
commit
b33338f626
3 módosított fájl, 7 hozzáadás és 15 törlés
  1. 1 1
      src/cipy/action.py
  2. 4 12
      src/cipy/common.py
  3. 2 2
      src/cipy/workflow.py

+ 1 - 1
src/cipy/action.py

@@ -107,7 +107,7 @@ class Script(Action):
     @final
     @cipy.runner.ipc
     def run(self, context: Context) -> Status:
-        self.log(f"Running {self.shell} script:\n{self.script}")
+        self.logger.info(f"Running %s script:\n%s", self.shell, self.script)
         with tempfile.TemporaryFile(mode="w+", suffix=self.shell.extension()) as script:
             script.write(self.script)
             try:

+ 4 - 12
src/cipy/common.py

@@ -165,18 +165,10 @@ class Action(BaseModel, abc.ABC):
     inputs: Inputs = Inputs()
     outputs: Outputs = Outputs()
 
-    @classmethod
-    def log(
-        cls,
-        message: str,
-        *args: Any,
-        indent: int = 0,
-        level: int = logging.INFO,
-        **kwargs: Any,
-    ) -> None:
-        """Write a log message describing what this action is doing..."""
-        logger = logging.getLogger(cls.__name__)
-        logger.log(level, ("  " * indent) + message, *args, **kwargs)
+    @property
+    def logger(self) -> logging.Logger:
+        """Get this class's logger"""
+        return logging.getLogger(self.__class__.__name__)
 
     # pylint: disable=unused-argument
     def enabled(self, status: Status, context: Context) -> bool:

+ 2 - 2
src/cipy/workflow.py

@@ -51,7 +51,7 @@ class Workflow(Action):
 
         with context.extend(needs=Results()) as outctx:
             while job := _next():
-                self.log(f"Running Job: {job.id}")
+                self.logger.info("Running Job: %s", job.id)
                 visited.add(job.id)
 
                 if job.action.enabled(status, context):
@@ -100,7 +100,7 @@ class Matrix(Action):
         status = Status.SUCCESS
 
         for matrix in self._expand(context):
-            self.log(str(matrix))
+            self.logger.info("%r", matrix)
             with context.extend(matrix=matrix) as matctx:
                 tmp = copy.deepcopy(self.uses)
                 status |= tmp.run(matctx)