Skip to content

Commit c9dff53

Browse files
author
Vladimir Kotal
committed
allow to set doprint
1 parent 9f72c2d commit c9dff53

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def main():
5555
cmd = Java(args.options, classpath=args.jar, java=args.java,
5656
java_opts=args.java_opts, redirect_stderr=False,
5757
main_class='org.opengrok.indexer.configuration.ConfigMerge',
58-
logger=logger)
58+
logger=logger, doprint=args.doprint)
5959
cmd.execute()
6060
ret = cmd.getretcode()
6161
if ret is None or ret != SUCCESS_EXITVAL:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151
cmd = Java(args.options, classpath=args.jar, java=args.java,
5252
java_opts=args.java_opts, redirect_stderr=False,
5353
main_class='org.opengrok.indexer.configuration.Groups',
54-
logger=logger)
54+
logger=logger, doprint=args.doprint)
5555
cmd.execute()
5656
ret = cmd.getretcode()
5757
if ret is None or ret != SUCCESS_EXITVAL:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def main():
6363

6464
indexer = Indexer(args.options, logger=logger, java=args.java,
6565
jar=args.jar, java_opts=args.java_opts,
66-
env_vars=args.environment, doprint=True)
66+
env_vars=args.environment, doprint=args.doprint)
6767
indexer.execute()
6868
ret = indexer.getretcode()
6969
if ret is None or ret != SUCCESS_EXITVAL:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def main():
5050
java = Java(args.options, logger=logger, java=args.java,
5151
jar=args.jar, java_opts=args.java_opts,
5252
classpath=args.classpath, main_class=args.mainclass,
53-
env_vars=args.environment)
53+
env_vars=args.environment, doprint=args.doprint)
5454
java.execute()
5555
ret = java.getretcode()
5656
if ret is None or ret != SUCCESS_EXITVAL:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ def main():
105105
args.project)
106106

107107
# Reindex with the modified logging.properties file and read-only config.
108-
command = []
109-
command.append('-R')
110-
command.append(conf_file)
108+
command = ['-R', conf_file]
111109
command.extend(args.options)
112110
java_opts = []
113111
if args.java_opts:
@@ -116,7 +114,7 @@ def main():
116114
format(logprop_file))
117115
indexer = Indexer(command, logger=logger, jar=args.jar,
118116
java=args.java, java_opts=java_opts,
119-
env_vars=args.environment)
117+
env_vars=args.environment, doprint=args.doprint)
120118
indexer.execute()
121119
ret = indexer.getretcode()
122120
os.remove(conf_file)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ def get_javaparser():
3131
help='java options', action='append')
3232
parser.add_argument('-e', '--environment', action='append',
3333
help='Environment variables in the form of name=value')
34+
parser.add_argument('--doprint', action='store_true', default=False,
35+
help='Print messages from the application as they '
36+
'are produced.')
3437

3538
group = parser.add_mutually_exclusive_group(required=True)
3639
group.add_argument('-a', '--jar',

0 commit comments

Comments
 (0)