summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-10 21:02:45 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-10 21:02:45 +0100
commit3fd156ef2cd87e0b70dc5906aad7071ab908cedf (patch)
tree7d99efe9348cba44096f061f3475583bc1207584
parentf71862b92f3d76251036485c27cf3a6a899635ab (diff)
Set default log level to INFO.
Sets default log level to INFO. Sets log level to DEBUG for com.orbekk packages.
-rw-r--r--jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java5
-rw-r--r--jsonrpc/src/main/resources/log4j.properties4
-rw-r--r--jsonrpc/target/classes/log4j.properties5
3 files changed, 6 insertions, 8 deletions
diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java b/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java
index 56a0fa1..7e1de00 100644
--- a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java
+++ b/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java
@@ -23,8 +23,9 @@ public class SameServiceImpl implements SameService {
@Override
public String participateNetwork(String networkName) {
logger.info("Got participation request.");
- if (networkName != this.networkName) {
- logger.info("Network name mismatch.");
+ if (!networkName.equals(this.networkName)) {
+ logger.warn("Client tried to join {}, but network name is {}.",
+ networkName, this.networkName);
}
return "<Not implemented>";
}
diff --git a/jsonrpc/src/main/resources/log4j.properties b/jsonrpc/src/main/resources/log4j.properties
index 6ca6c6f..70f8a5f 100644
--- a/jsonrpc/src/main/resources/log4j.properties
+++ b/jsonrpc/src/main/resources/log4j.properties
@@ -1,5 +1,7 @@
-log4j.rootLogger=DEBUG, A1
+log4j.rootLogger=INFO, A1
+log4j.com.orbekk=DEBUG, A1
log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n
+
diff --git a/jsonrpc/target/classes/log4j.properties b/jsonrpc/target/classes/log4j.properties
deleted file mode 100644
index 6ca6c6f..0000000
--- a/jsonrpc/target/classes/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootLogger=DEBUG, A1
-
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n