avoid logging.basicConfig()

Author: Vladimir Kotal

opengrok-tools/src/main/python/opengrok_tools/config_merge.py

@@ -27,6 +27,7 @@
 
 from .utils.java import Java, get_javaparser
 
+
 """
  Wrapper for Java program merging OpenGrok configuration.
 """
@@ -39,12 +40,13 @@ def main():
 
     args = parser.parse_args()
 
+    # Avoid using utils.log.get_console_level() since the stdout of the program
+    # is interpreted as data.
+    loglevel = logging.INFO
     if args.debug:
-        logging.basicConfig(level=logging.DEBUG)
-    else:
-        logging.basicConfig()
-
+        loglevel = logging.DEBUG
     logger = logging.getLogger(__name__)
+    logger.setLevel(loglevel)
 
     cmd = Java(args.options, classpath=args.jar, java=args.java,
                java_opts=args.java_opts, redirect_stderr=False,

opengrok-tools/src/main/python/opengrok_tools/groups.py

@@ -23,10 +23,11 @@
 
 import argparse
 import logging
-import os
 import sys
 
 from .utils.java import Java, get_javaparser
+from .utils.log import get_console_logger
+
 
 """
  Script for manipulating project groups
@@ -40,12 +41,10 @@ def main():
 
     args = parser.parse_args()
 
+    loglevel = logging.INFO
     if args.debug:
-        logging.basicConfig(level=logging.DEBUG)
-    else:
-        logging.basicConfig()
-
-    logger = logging.getLogger(__name__)
+        loglevel = logging.DEBUG
+    logger = get_console_logger(__name__, loglevel)
 
     cmd = Java(args.options, classpath=args.jar, java=args.java,
                java_opts=args.java_opts, redirect_stderr=False,

opengrok-tools/src/main/python/opengrok_tools/utils/command.py

@@ -65,7 +65,6 @@ def __init__(self, cmd, args_subst=None, args_append=None, logger=None,
         self.doprint = doprint
 
         self.logger = logger or logging.getLogger(__name__)
-        logging.basicConfig()
 
         if args_subst or args_append:
             self.fill_arg(args_append, args_subst)