feat: rename argument

Author: kannon92

cwltool/argparser.py

@@ -41,10 +41,10 @@ def arg_parser() -> argparse.ArgumentParser:
     )
 
     parser.add_argument(
-        "--log-host",
+        "--log-dir",
         type=str,
         default="",
-        help="Output directory. The default is the current directory.",
+        help="Log your tools stdout/stderr to this location outside of container",
     )
 
 

cwltool/context.py

@@ -118,7 +118,7 @@ def __init__(self, kwargs: Optional[Dict[str, Any]] = None) -> None:
         self.pull_image = True  # type: bool
         self.rm_container = True  # type: bool
         self.move_outputs = "move"  # type: str
-        self.log_host = ""
+        self.log_dir = "" # type: str
         self.streaming_allowed: bool = False
 
         self.singularity = False  # type: bool

cwltool/job.py

@@ -226,10 +226,10 @@ def is_streamable(file: str) -> bool:
                         indent=4,
                     ),
                 )
-        if runtimeContext.log_host == "":
-            self.base_path_stdout_stderr = self.outdir
+        if runtimeContext.log_dir == "":
+            self.base_path_logs = self.outdir
         else:
-            self.base_path_stdout_stderr = runtimeContext.log_host
+            self.base_path_logs = runtimeContext.log_dir
             # Generate random ids 
             import uuid
             self.stdout = self.stdout if not self.stdout else self.stdout + uuid.uuid4().hex
@@ -285,8 +285,8 @@ def _execute(
                 ]
             ),
             " < %s" % self.stdin if self.stdin else "",
-            " > %s" % os.path.join(self.base_path_stdout_stderr, self.stdout) if self.stdout else "",
-            " 2> %s" % os.path.join(self.base_path_stdout_stderr, self.stderr) if self.stderr else "",
+            " > %s" % os.path.join(self.base_path_logs, self.stdout) if self.stdout else "",
+            " 2> %s" % os.path.join(self.base_path_logs, self.stderr) if self.stderr else "",
         )
         if self.joborder is not None and runtimeContext.research_obj is not None:
             job_order = self.joborder
@@ -316,20 +316,19 @@ def _execute(
 
             stderr_path = None
             if self.stderr is not None:
-                abserr = os.path.join(self.base_path_stdout_stderr, self.stderr)
+                abserr = os.path.join(self.base_path_logs, self.stderr)
                 dnerr = os.path.dirname(abserr)
                 if dnerr and not os.path.exists(dnerr):
                     os.makedirs(dnerr)
                 stderr_path = abserr
 
             stdout_path = None
             if self.stdout is not None:
-                absout = os.path.join(self.base_path_stdout_stderr, self.stdout)
+                absout = os.path.join(self.base_path_logs, self.stdout)
                 dnout = os.path.dirname(absout)
                 if dnout and not os.path.exists(dnout):
                     os.makedirs(dnout)
                 stdout_path = absout
-            _logger.debug("stderr: %s stdout: %s hostdir: %s", stderr_path, stdout_path, self.base_path_stdout_stderr)
             commands = [str(x) for x in runtime + self.command_line]
             if runtimeContext.secret_store is not None:
                 commands = cast(

cwltool/main.py

@@ -1262,8 +1262,7 @@ def main(
                 runtimeContext.move_outputs = "copy"
             runtimeContext.tmp_outdir_prefix = args.cachedir
 
-        if args.log_host:
-            runtimeContext.log_host = args.log_host
+        runtimeContext.log_dir = args.log_dir
 
         runtimeContext.secret_store = getdefault(
             runtimeContext.secret_store, SecretStore()