ZOOKEEPER-778: Add server id to message logs

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@958096 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -68,12 +68,15 @@ IMPROVEMENTS:
   ZOOKEEPER-766. forrest recipes docs don't mention the lock/queue recipe
   implementations available in the release (phunt via mahadev)
 
-  ZOOKEEPER-769: Leader can treat observers as quorum members (Sergey
-  Doroshenko via henryr)
+  ZOOKEEPER-769: Leader can treat observers as quorum members
+  (Sergey Doroshenko via henryr)
+
+  ZOOKEEPER-788: Add server id to message logs
+  (Ivan Kelly via flavio)
 
 NEW FEATURES:
-  ZOOKEEPER-729. Java client API to recursively delete a subtree. (Kay
-  Kay via henry)
+  ZOOKEEPER-729. Java client API to recursively delete a subtree.
+  (Kay Kay via henry)
 
   ZOOKEEPER-747. Add C# generation to Jute (Eric Hauser via phunt)
 

conf/log4j.properties

@@ -19,7 +19,7 @@ log4j.rootLogger=INFO, CONSOLE
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.Threshold=INFO
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
 
 #
 # Add ROLLINGFILE to rootLogger to get log file output
@@ -34,7 +34,7 @@ log4j.appender.ROLLINGFILE.MaxFileSize=10MB
 #log4j.appender.ROLLINGFILE.MaxBackupIndex=10
 
 log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
 
 
 #
@@ -46,4 +46,4 @@ log4j.appender.TRACEFILE.File=zookeeper_trace.log
 
 log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
 ### Notice we are including log4j's NDC here (%x)
-log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
+log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L][%x] - %m%n

src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java

@@ -282,7 +282,7 @@ public class Log4JSource implements LogSource {
 	File f = new File(file);
 	RandomAccessFileReader in = new RandomAccessFileReader(f);
 	SimpleDateFormat dateformat = new SimpleDateFormat(DATE_FORMAT);
-	Pattern idp = Pattern.compile("Notification:\\s+\\d+,\\s+\\d+,\\s+\\d+,\\s+(\\d+)");// 1, My\\s+id\\s+=\\s+(\\d+)");
+	Pattern idp = Pattern.compile("\\[myid:(\\d+)\\]");
 
 	long lastFp = in.getPosition();
 	String line = in.readLine();

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java

@@ -32,6 +32,8 @@ import java.util.Properties;
 import java.util.Map.Entry;
 
 import org.apache.log4j.Logger;
+import org.apache.log4j.MDC;
+
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
@@ -306,6 +308,7 @@ public class QuorumPeerConfig {
             }
             try {
                 serverId = Long.parseLong(myIdString);
+		MDC.put("myid", serverId);
             } catch (NumberFormatException e) {
                 throw new IllegalArgumentException("serverid " + myIdString
                         + " is not a number");