Fix duplicated logging, only initialize defaultStreamHandler once. (#659)

Author: tetron

cwltool/argparser.py

@@ -7,18 +7,14 @@
 
 from typing import (Any, AnyStr, Dict, List, Sequence, Text, Union, cast)
 
+from . import loghandler
 from schema_salad.ref_resolver import file_uri
 from .process import (Process, shortname)
 from .resolver import ga4gh_tool_registries
 from .software_requirements import (SOFTWARE_REQUIREMENTS_ENABLED)
 
 _logger = logging.getLogger("cwltool")
 
-defaultStreamHandler = logging.StreamHandler()
-_logger.addHandler(defaultStreamHandler)
-_logger.setLevel(logging.INFO)
-
-
 def arg_parser():  # type: () -> argparse.ArgumentParser
     parser = argparse.ArgumentParser(description='Reference executor for Common Workflow Language')
     parser.add_argument("--basedir", type=Text)

cwltool/executors.py

@@ -7,20 +7,15 @@
 
 from typing import Dict, Text, Any, Tuple, Set, List
 
-from cwltool.builder import Builder
-from cwltool.errors import WorkflowException
-from cwltool.mutation import MutationManager
-from cwltool.job import JobBase
-from cwltool.process import relocateOutputs, cleanIntermediate, Process
-
+from .builder import Builder
+from .errors import WorkflowException
+from .mutation import MutationManager
+from .job import JobBase
+from .process import relocateOutputs, cleanIntermediate, Process
+from . import loghandler
 
 _logger = logging.getLogger("cwltool")
 
-defaultStreamHandler = logging.StreamHandler()
-_logger.addHandler(defaultStreamHandler)
-_logger.setLevel(logging.INFO)
-
-
 class JobExecutor(object):
     __metaclass__ = ABCMeta
 

cwltool/loghandler.py

@@ -0,0 +1,6 @@
+import logging
+
+_logger = logging.getLogger("cwltool")
+defaultStreamHandler = logging.StreamHandler()
+_logger.addHandler(defaultStreamHandler)
+_logger.setLevel(logging.INFO)

cwltool/main.py

@@ -28,6 +28,7 @@
 from .load_tool import (FetcherConstructorType, resolve_tool_uri,
                         fetch_document, make_tool, validate_document, jobloaderctx,
                         resolve_overrides, load_overrides)
+from .loghandler import defaultStreamHandler
 from .mutation import MutationManager
 from .pack import pack
 from .pathmapper import (adjustDirObjs, trim_listing, visit_class)
@@ -43,11 +44,6 @@
 
 _logger = logging.getLogger("cwltool")
 
-defaultStreamHandler = logging.StreamHandler()
-_logger.addHandler(defaultStreamHandler)
-_logger.setLevel(logging.INFO)
-
-
 def single_job_executor(t,  # type: Process
                         job_order_object,  # type: Dict[Text, Any]
                         **kwargs  # type: Any