opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  gerrit.sh: Improve error message when JRE cannot be found
  PrologEnvironment#setPredicate: Reduce log level to DEBUG

Change-Id: I26703bd42f91a96dc985a2de8e90f93be78bdd63
This commit is contained in:
David Pursehouse
2019-02-18 21:07:53 +09:00
parent 10c1299c83 998cbc1fa4
commit db46a86e38
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/rules/PrologEnvironment.java
View File

@@ -83,7 +83,7 @@ public class PrologEnvironment extends BufferingPrologControl {
public void setPredicate(Predicate goal) {
super.setPredicate(goal);
int reductionLimit = args.reductionLimit(goal);
logger.atInfo().log("setting reductionLimit %d", reductionLimit);
logger.atFine().log("setting reductionLimit %d", reductionLimit);
setReductionLimit(reductionLimit);
}

6
resources/com/google/gerrit/pgm/init/gerrit.sh
View File

@@ -263,9 +263,9 @@ if test -z "$JAVA" \
fi
if test -z "$JAVA" ; then
echo >&2 "Cannot find a JRE or JDK. Please set JAVA_HOME or"
echo >&2 "container.javaHome in $GERRIT_SITE/etc/gerrit.config"
echo >&2 "to a >=1.7 JRE"
echo >&2 "Cannot find a JRE or JDK. Please ensure that the JAVA_HOME environment"
echo >&2 "variable or container.javaHome in $GERRIT_SITE/etc/gerrit.config is"
echo >&2 "set to a valid >=1.7 JRE location"
exit 1
fi