summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jack-server/src/com/android/jack/server/JackSimpleServer.java20
-rw-r--r--jack/rsc/debug.jack.logging.properties2
-rw-r--r--jack/rsc/error.jack.logging.properties2
-rw-r--r--jack/rsc/info.jack.logging.properties2
-rw-r--r--jack/rsc/initial.logging.properties2
-rw-r--r--jack/rsc/trace.jack.logging.properties2
-rw-r--r--jack/rsc/warning.jack.logging.properties2
7 files changed, 21 insertions, 11 deletions
diff --git a/jack-server/src/com/android/jack/server/JackSimpleServer.java b/jack-server/src/com/android/jack/server/JackSimpleServer.java
index 6393653..baca0d1 100644
--- a/jack-server/src/com/android/jack/server/JackSimpleServer.java
+++ b/jack-server/src/com/android/jack/server/JackSimpleServer.java
@@ -27,6 +27,7 @@ import com.android.sched.util.file.OutputStreamFile;
import com.android.sched.util.file.WrongPermissionException;
import com.android.sched.util.findbugs.SuppressFBWarnings;
import com.android.sched.util.location.NoLocation;
+import com.android.sched.util.log.LoggerFactory;
import com.android.sched.util.log.tracer.probe.MemoryBytesProbe;
import com.android.sched.util.log.tracer.probe.TimeNanosProbe;
@@ -86,6 +87,20 @@ import javax.annotation.Nonnull;
* Server controlling the number of Jack compilations that are executed simultaneously.
*/
public class JackSimpleServer {
+
+ static {
+ // It seems that loggers must be created from parents to children to have the loggers
+ // correctly initialized. Thus load the initial configuration that define specific level
+ // for some packages firstly. Otherwise the parent logger of JackSimpleServer is not created
+ // before JackSimpleServer logger. Create the JackSimpleServer logger in first means that
+ // it will not have com.android.jack.server as parent even if it is created after.
+ LoggerFactory.loadLoggerConfiguration(JackSimpleServer.class, "/initial.logging.properties");
+ }
+
+
+ @Nonnull
+ private static Logger logger = Logger.getLogger(JackSimpleServer.class.getName());
+
private static int port;
@Nonnull
@@ -123,9 +138,6 @@ public class JackSimpleServer {
@Nonnull
private static ServerTask service = new ServerTaskInsideVm();
- @Nonnull
- private static Logger logger = Logger.getLogger(JackSimpleServer.class.getSimpleName());
-
private static final int CMD_IDX_CMD = 0;
private static final int CMD_IDX_OUT = 1;
private static final int CMD_IDX_ERR = 2;
@@ -169,8 +181,6 @@ public class JackSimpleServer {
abort();
}
- logger = Logger.getLogger(JackSimpleServer.class.getSimpleName() + "." + port);
-
int count = 0;
try {
count = Integer.parseInt(args[CLI_IDX_COUNT]);
diff --git a/jack/rsc/debug.jack.logging.properties b/jack/rsc/debug.jack.logging.properties
index 5ca142a..d6c908c 100644
--- a/jack/rsc/debug.jack.logging.properties
+++ b/jack/rsc/debug.jack.logging.properties
@@ -28,7 +28,7 @@ java.util.logging.ConsoleHandler.formatter= com.android.sched.util.log.ConsoleFo
.level= FINE
# configure each logger
-com.android.jack.server.level=INFO
+com.android.jack.server.level= INFO
com.android.sched.level= WARNING
# ...
diff --git a/jack/rsc/error.jack.logging.properties b/jack/rsc/error.jack.logging.properties
index 7bc1f69..b2406ef 100644
--- a/jack/rsc/error.jack.logging.properties
+++ b/jack/rsc/error.jack.logging.properties
@@ -28,4 +28,4 @@ java.util.logging.ConsoleHandler.formatter= com.android.sched.util.log.ConsoleFo
.level= SEVERE
# configure each logger
-com.android.jack.server.level=INFO
+com.android.jack.server.level= INFO
diff --git a/jack/rsc/info.jack.logging.properties b/jack/rsc/info.jack.logging.properties
index 09cd9fe..3906720 100644
--- a/jack/rsc/info.jack.logging.properties
+++ b/jack/rsc/info.jack.logging.properties
@@ -28,5 +28,5 @@ java.util.logging.ConsoleHandler.formatter= com.android.sched.util.log.ConsoleFo
.level= INFO
# configure each logger
-com.android.jack.server.level=INFO
+com.android.jack.server.level= INFO
com.android.sched.level= WARNING
diff --git a/jack/rsc/initial.logging.properties b/jack/rsc/initial.logging.properties
index baa12b0..bbd6f1e 100644
--- a/jack/rsc/initial.logging.properties
+++ b/jack/rsc/initial.logging.properties
@@ -28,4 +28,4 @@ java.util.logging.ConsoleHandler.formatter= com.android.sched.util.log.ConsoleFo
.level= WARNING
# configure each logger
-com.android.jack.server.level=INFO
+com.android.jack.server.level= INFO
diff --git a/jack/rsc/trace.jack.logging.properties b/jack/rsc/trace.jack.logging.properties
index 25230e6..bf14702 100644
--- a/jack/rsc/trace.jack.logging.properties
+++ b/jack/rsc/trace.jack.logging.properties
@@ -28,4 +28,4 @@ java.util.logging.ConsoleHandler.formatter= com.android.sched.util.log.ConsoleFo
.level= FINEST
# configure each logger
-com.android.jack.server.level=INFO
+com.android.jack.server.level= INFO
diff --git a/jack/rsc/warning.jack.logging.properties b/jack/rsc/warning.jack.logging.properties
index baa12b0..bbd6f1e 100644
--- a/jack/rsc/warning.jack.logging.properties
+++ b/jack/rsc/warning.jack.logging.properties
@@ -28,4 +28,4 @@ java.util.logging.ConsoleHandler.formatter= com.android.sched.util.log.ConsoleFo
.level= WARNING
# configure each logger
-com.android.jack.server.level=INFO
+com.android.jack.server.level= INFO