add loglevel arg to tools (#2493)

fixes #2488

Author: Vladimir Kotal

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

@@ -26,6 +26,7 @@
 import sys
 
 from .utils.java import Java, get_javaparser
+from .utils.log import print_exc_exit
 
 
 """
@@ -38,15 +39,15 @@ def main():
                                                  'configuration merging',
                                      parents=[get_javaparser()])
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
     # Avoid using utils.log.get_console_level() since the stdout of the program
     # is interpreted as data.
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
     logger = logging.getLogger(__name__)
-    logger.setLevel(loglevel)
+    logger.setLevel(args.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/deploy.py

@@ -23,12 +23,13 @@
 #
 
 import argparse
-import logging
 import os
 import tempfile
 from zipfile import ZipFile
 from shutil import copyfile
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, \
+    add_log_level_argument, print_exc_exit
+
 
 """
  deploy war file
@@ -98,21 +99,20 @@ def deploy_war(logger, sourceWar, targetWar, configFile=None):
 def main():
     parser = argparse.ArgumentParser(description='Deploy WAR file')
 
-    parser.add_argument('-D', '--debug', action='store_true',
-                        help='Enable debug prints')
+    add_log_level_argument(parser)
     parser.add_argument('-c', '--config',
                         help='Path to OpenGrok configuration file')
     parser.add_argument('source_war', nargs=1,
                         help='Path to war file to deploy')
     parser.add_argument('target_war', nargs=1,
                         help='Path where to deploy source war file to')
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     deploy_war(logger, args.source_war[0], args.target_war[0], args.config)
 

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

@@ -22,11 +22,10 @@
 #
 
 import argparse
-import logging
 import sys
 
 from .utils.java import Java, get_javaparser
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, print_exc_exit
 
 
 """
@@ -39,12 +38,12 @@ def main():
                                                  'group manipulation',
                                      parents=[get_javaparser()])
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.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/indexer.py

@@ -24,12 +24,11 @@
 
 
 import argparse
-import logging
 import sys
 
 from .utils.indexer import FindCtags, Indexer
 from .utils.java import get_javaparser
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, print_exc_exit
 
 """
   opengrok.jar wrapper
@@ -44,12 +43,12 @@ def main():
     parser.add_argument('-C', '--no_ctags_check', action='store_true',
                         default=False, help='Suppress checking for ctags')
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     #
     # Since it is not possible to tell what kind of action is performed,

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

@@ -23,11 +23,10 @@
 #
 
 import argparse
-import logging
 import sys
 
 from .utils.java import Java, get_javaparser
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, print_exc_exit
 
 
 def main():
@@ -36,12 +35,12 @@ def main():
     parser.add_argument('-m', '--mainclass', required=True,
                         help='Main class')
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     java = Java(args.options, logger=logger, java=args.java,
                 jar=args.jar, java_opts=args.java_opts,

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

@@ -39,7 +39,8 @@
 from filelock import Timeout, FileLock
 
 from .utils.hook import run_hook
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, \
+    add_log_level_argument, print_exc_exit
 from .utils.opengrok import get_repos, get_config_value, get_repo_type
 from .utils.readconfig import read_config
 from .utils.repofactory import get_repository
@@ -53,7 +54,7 @@
     print("Need Python 3, you are running {}".format(major_version))
     sys.exit(1)
 
-__version__ = "0.5"
+__version__ = "0.6"
 
 # "constants"
 HOOK_TIMEOUT_PROPERTY = 'hook_timeout'
@@ -120,8 +121,7 @@ def main():
     parser = argparse.ArgumentParser(description='project mirroring')
 
     parser.add_argument('project')
-    parser.add_argument('-D', '--debug', action='store_true',
-                        help='Enable debug prints')
+    add_log_level_argument(parser)
     parser.add_argument('-c', '--config',
                         help='config file in JSON/YAML format')
     parser.add_argument('-U', '--uri', default='http://localhost:8080/source',
@@ -133,12 +133,12 @@ def main():
     parser.add_argument('-I', '--incoming', action='store_true',
                         help='Check for incoming changes, terminate the '
                              'processing if not found.')
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     if args.config:
         config = read_config(logger, args.config)
@@ -306,8 +306,7 @@ def main():
                      format(logfile))
 
         logger = logger.getChild("rotating")
-        logger.setLevel(logging.DEBUG if args.debug
-                        else logging.INFO)
+        logger.setLevel(args.loglevel)
         logger.propagate = False
         handler = RotatingFileHandler(logfile, maxBytes=0, mode='a',
                                       backupCount=args.backupcount)

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

@@ -28,7 +28,6 @@
 
 import argparse
 import io
-import logging
 import os
 import shutil
 import sys
@@ -37,7 +36,8 @@
 from filelock import Timeout, FileLock
 
 from .utils.command import Command
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, \
+    add_log_level_argument, print_exc_exit
 from .utils.opengrok import get_configuration, set_configuration, \
     add_project, delete_project, get_config_value
 from .utils.utils import get_command, is_web_uri
@@ -47,7 +47,7 @@
     print("Need Python 3, you are running {}".format(MAJOR_VERSION))
     sys.exit(1)
 
-__version__ = "0.3"
+__version__ = "0.4"
 
 
 def exec_command(doit, logger, cmd, msg):
@@ -205,8 +205,8 @@ def main():
     parser = argparse.ArgumentParser(description='project management.',
                                      formatter_class=argparse.
                                      ArgumentDefaultsHelpFormatter)
-    parser.add_argument('-D', '--debug', action='store_true',
-                        help='Enable debug prints')
+
+    add_log_level_argument(parser)
     parser.add_argument('-b', '--base', default="/var/opengrok",
                         help='OpenGrok instance base directory')
     parser.add_argument('-R', '--roconfig',
@@ -240,18 +240,19 @@ def main():
                             'with current '
                             'configuration.')
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
+
     doit = not args.noop
     configmerge = None
 
     #
     # Setup logger as a first thing after parsing arguments so that it can be
     # used through the rest of the program.
     #
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     if args.nosourcedelete and not args.delete:
         logger.error("The no source delete option is only valid for delete")
@@ -287,8 +288,9 @@ def main():
             sys.exit(1)
 
         configmerge = [configmerge_file]
-        if args.debug:
-            configmerge.append('-D')
+        if args.loglevel:
+            configmerge.append('-l')
+            configmerge.append(str(args.loglevel))
 
         if args.jar is None:
             logger.error('jar file needed for config merge tool, '

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

@@ -23,14 +23,13 @@
 
 
 import argparse
-import logging
 import os
 import sys
 import tempfile
 
 from .utils.indexer import Indexer
 from .utils.java import get_javaparser
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename, print_exc_exit
 from .utils.opengrok import get_configuration
 
 """
@@ -85,12 +84,12 @@ def main():
     parser.add_argument('-U', '--uri', default='http://localhost:8080/source',
                         help='URI of the webapp with context path')
 
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     # Make sure the log directory exists.
     if not os.path.isdir(args.directory):

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

@@ -31,7 +31,6 @@
 """
 
 import argparse
-import logging
 import multiprocessing
 import os
 import sys
@@ -44,14 +43,16 @@
 from .utils.opengrok import list_indexed_projects, get_config_value
 from .utils.readconfig import read_config
 from .utils.utils import is_web_uri
-from .utils.log import get_console_logger, get_class_basename
+from .utils.log import get_console_logger, get_class_basename,\
+    add_log_level_argument, print_exc_exit
+
 
 major_version = sys.version_info[0]
 if (major_version < 3):
     print("Need Python 3, you are running {}".format(major_version))
     sys.exit(1)
 
-__version__ = "0.6"
+__version__ = "0.7"
 
 
 def worker(base):
@@ -82,20 +83,19 @@ def main():
 
     parser.add_argument('-I', '--indexed', action='store_true',
                         help='Sync indexed projects only')
-    parser.add_argument('-D', '--debug', action='store_true',
-                        help='Enable debug prints')
+    add_log_level_argument(parser)
     parser.add_argument('-i', '--ignore_errors', nargs='*',
                         help='ignore errors from these projects')
     parser.add_argument('-c', '--config', required=True,
                         help='config file in JSON format')
     parser.add_argument('-U', '--uri', default='http://localhost:8080/source',
                         help='URI of the webapp with context path')
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args()
+    except ValueError as e:
+        print_exc_exit(e)
 
-    loglevel = logging.INFO
-    if args.debug:
-        loglevel = logging.DEBUG
-    logger = get_console_logger(get_class_basename(), loglevel)
+    logger = get_console_logger(get_class_basename(), args.loglevel)
 
     uri = args.uri
     if not is_web_uri(uri):
@@ -176,7 +176,7 @@ def main():
 
             cmds_base = []
             for d in dirs_to_process:
-                cmd_base = CommandSequenceBase(d, commands, loglevel,
+                cmd_base = CommandSequenceBase(d, commands, args.loglevel,
                                                config.get("cleanup"))
                 cmds_base.append(cmd_base)