summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-30 18:27:07 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-30 18:27:07 +0200
commit39ef3d1403b0e5b8926785b6876779945a851360 (patch)
tree47654374a0949331169290c84078a77c07578834
parent1be85fe80d23502a0cc0f61a6d53b50dc32c0ceb (diff)
downloadsonarqube-39ef3d1403b0e5b8926785b6876779945a851360.tar.gz
sonarqube-39ef3d1403b0e5b8926785b6876779945a851360.zip
SONAR-4898 improve logs on errors
-rw-r--r--server/sonar-process/src/main/java/org/sonar/process/Monitor.java1
-rw-r--r--sonar-application/src/main/assembly/lib/jsw/wrapper.conf8
2 files changed, 5 insertions, 4 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
index a695286f9c8..c52ba7e222c 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
@@ -104,6 +104,7 @@ public class Monitor extends Thread implements Terminable {
while (ok) {
for (ProcessWrapper process : processes) {
if (!processIsValid(process)) {
+ LOGGER.info("{} is down, stopping processes", process.getName());
ok = false;
interrupt();
}
diff --git a/sonar-application/src/main/assembly/lib/jsw/wrapper.conf b/sonar-application/src/main/assembly/lib/jsw/wrapper.conf
index 77444e18905..1020f2003cb 100644
--- a/sonar-application/src/main/assembly/lib/jsw/wrapper.conf
+++ b/sonar-application/src/main/assembly/lib/jsw/wrapper.conf
@@ -6,12 +6,12 @@
#wrapper.java.command=/path/to/my/jdk/bin/java
wrapper.java.command=java
-# Java Additional Parameters
+# Xmx can't be set to lower value because of compatibility with Java 6
wrapper.java.additional.1=-Xmx32m
wrapper.java.additional.2=-Djava.awt.headless=true
# Initial JVM heap size (in MB)
-wrapper.java.initmemory=32
+wrapper.java.initmemory=16
# Java Main class. This class must implement the WrapperListener interface
# or guarantee that the WrapperManager class is initialized. Helper
@@ -41,7 +41,7 @@ wrapper.java.maxmemory=0
wrapper.console.format=PM
# Log Level for console output. (See docs for log levels)
-wrapper.console.loglevel=INFO
+wrapper.console.loglevel=ERROR
# Log file to use for wrapper output logging.
wrapper.logfile=../../logs/application.log
@@ -50,7 +50,7 @@ wrapper.logfile=../../logs/application.log
wrapper.logfile.format=M
# Log Level for log file output. (See docs for log levels)
-wrapper.logfile.loglevel=INFO
+wrapper.logfile.loglevel=ERROR
# Maximum size that the log file will be allowed to grow to before
# the log is rolled. Size is specified in bytes. The default value