Skip to content

Commit 3e9bca4

Browse files
author
Peter Amstutz
authored
Add --enable-color/--disable-color (#1140)
1 parent 2018456 commit 3e9bca4

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

cwltool/argparser.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@ def arg_parser(): # type: () -> argparse.ArgumentParser
250250
help="Enable loading and running cwltool extensions "
251251
"to CWL spec.", default=False)
252252

253+
exgroup = parser.add_mutually_exclusive_group()
254+
exgroup.add_argument("--enable-color", action="store_true",
255+
help="Enable colored logging (default true)", default=True)
256+
exgroup.add_argument("--disable-color", action="store_false", dest="enable_color",
257+
help="Enable colored logging (default true)")
258+
253259
parser.add_argument("--default-container",
254260
help="Specify a default docker container that will be used if the workflow fails to specify one.")
255261
parser.add_argument("--no-match-user", action="store_true",

cwltool/main.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,12 +547,14 @@ def main(argsl=None, # type: List[str]
547547
stderr_handler.setLevel(logging.DEBUG)
548548
rdflib_logger.setLevel(logging.DEBUG)
549549
formatter = None # type: Optional[logging.Formatter]
550+
fmtclass = coloredlogs.ColoredFormatter if args.enable_color else logging.Formatter
550551
if args.timestamps:
551-
formatter = coloredlogs.ColoredFormatter(
552+
formatter = fmtclass(
552553
"[%(asctime)s] %(levelname)s %(message)s",
553554
"%Y-%m-%d %H:%M:%S")
555+
554556
else:
555-
formatter = coloredlogs.ColoredFormatter("%(levelname)s %(message)s")
557+
formatter = fmtclass("%(levelname)s %(message)s")
556558
stderr_handler.setFormatter(formatter)
557559
##
558560

0 commit comments

Comments
 (0)