modify the local ip

cat-consumer/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
+		<version>0.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-consumer</artifactId>

cat-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
+		<version>0.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-core</artifactId>

cat-core/src/main/java/com/dianping/cat/message/internal/DefaultMessageManager.java

@@ -10,6 +10,7 @@ import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.configuration.LocalIP;
 import com.dianping.cat.configuration.model.entity.Config;
 import com.dianping.cat.configuration.model.entity.Domain;
 import com.dianping.cat.message.Message;
@@ -154,12 +155,10 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
 		m_domain = firstDomain == null ? new Domain("unknown").setEnabled(false) : firstDomain;
 
 		try {
-			InetAddress localHost = InetAddress.getLocalHost();
-
-			m_hostName = localHost.getHostName();
+			m_hostName = InetAddress.getLocalHost().getHostName();
 
 			if (m_domain.getIp() == null) {
-				m_domain.setIp(localHost.getHostAddress());
+				m_domain.setIp(LocalIP.getAddress());
 			}
 		} catch (UnknownHostException e) {
 			m_logger.warn("Unable to get local host!", e);
@@ -236,7 +235,7 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
 			String groupName = thread.getThreadGroup().getName();
 
 			m_tree.setThreadGroupName(groupName);
-			m_tree.setThreadId(thread.getId()+"");
+			m_tree.setThreadId(thread.getId() + "");
 			m_tree.setThreadName(thread.getName());
 
 			m_tree.setDomain(domain);

cat-core/src/main/java/com/dianping/cat/message/internal/MessageIdFactory.java

 package com.dianping.cat.message.internal;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.util.List;
+
+import com.dianping.cat.configuration.LocalIP;
+import com.site.helper.Splitters;
 
 public class MessageIdFactory {
 	private long m_lastTimestamp = getTimestamp();
@@ -46,19 +48,27 @@ public class MessageIdFactory {
 		m_domain = domain;
 
 		if (m_ipAddress == null) {
-			try {
-				byte[] bytes = InetAddress.getLocalHost().getAddress();
-				StringBuilder sb = new StringBuilder(bytes.length / 2);
-
-				for (byte b : bytes) {
-					sb.append(Integer.toHexString((b >> 4) & 0x0F));
-					sb.append(Integer.toHexString(b & 0x0F));
-				}
-
-				m_ipAddress = sb.toString();
-			} catch (UnknownHostException e) {
-				// ignore it
+			String ip = LocalIP.getAddress();
+			List<String> items = Splitters.by(".").noEmptyItem().split(ip);
+			byte[] bytes = new byte[4];
+			
+			for (int i = 0; i < 4; i++) {
+				bytes[i] = (byte)Integer.parseInt(items.get(i));
+			}
+			/*	try {
+	         byte[] bytess = InetAddress.getLocalHost().getAddress();
+         } catch (UnknownHostException e) {
+	         // TODO Auto-generated catch block
+	         e.printStackTrace();
+         }*/
+			StringBuilder sb = new StringBuilder(bytes.length / 2);
+
+			for (byte b : bytes) {
+				sb.append(Integer.toHexString((b >> 4) & 0x0F));
+				sb.append(Integer.toHexString(b & 0x0F));
 			}
+
+			m_ipAddress = sb.toString();
 		}
 	}
 

cat-core/src/main/java/com/dianping/cat/status/StatusUpdateTask.java

 package com.dianping.cat.status;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.configuration.LocalIP;
 import com.dianping.cat.message.Heartbeat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.internal.MilliSecondTimer;
@@ -26,11 +24,7 @@ public class StatusUpdateTask implements Runnable, Initializable {
 
 	@Override
 	public void initialize() throws InitializationException {
-		try {
-			m_ipAddress = InetAddress.getLocalHost().getHostAddress();
-		} catch (UnknownHostException e) {
-			// ignore it
-		}
+			m_ipAddress = LocalIP.getAddress();
 	}
 
 	@Override

cat-home/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
+		<version>0.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-home</artifactId>

cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseCompositeModelService.java

@@ -13,6 +13,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.configuration.LocalIP;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
@@ -129,7 +130,7 @@ public abstract class BaseCompositeModelService<T> extends ModelServiceWithCalSu
 		String localHost = null;
 
 		try {
-			localAddress = InetAddress.getLocalHost().getHostAddress();
+			localAddress = LocalIP.getAddress();
 			localHost = InetAddress.getLocalHost().getHostName();
 		} catch (UnknownHostException e) {
 			// ignore it

cat-job/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
+		<version>0.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-job</artifactId>

cat-job/src/main/java/com/dianping/cat/job/hdfs/HdfsMessageStorage.java

 package com.dianping.cat.job.hdfs;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.util.Date;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -13,6 +12,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
+import com.dianping.cat.configuration.LocalIP;
 import com.dianping.cat.message.spi.MessagePathBuilder;
 import com.dianping.cat.message.spi.MessageStorage;
 import com.dianping.cat.message.spi.MessageTree;
@@ -90,7 +90,8 @@ public class HdfsMessageStorage implements MessageStorage, Initializable, Dispos
 		private void handle(MessageTree tree) {
 			try {
 				String tmp = m_builder.getMessagePath(tree.getDomain(), new Date(tree.getMessage().getTimestamp()));
-				String ipAddress = InetAddress.getLocalHost().getHostAddress();
+				//String ipAddress = InetAddress.getLocalHost().getHostAddress();
+				String ipAddress = LocalIP.getAddress();
 				String path = tmp + "-" + ipAddress;
 				OutputChannel channel = m_manager.openChannel(path, false);
 				int length = channel.write(tree);

cat-job/src/main/java/com/dianping/cat/job/storage/RemoteMessageBucket.java

 package com.dianping.cat.job.storage;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -13,6 +12,7 @@ import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.configuration.LocalIP;
 import com.dianping.cat.job.hdfs.InputChannel;
 import com.dianping.cat.job.hdfs.InputChannelManager;
 import com.dianping.cat.job.hdfs.OutputChannel;
@@ -133,7 +133,8 @@ public class RemoteMessageBucket implements Bucket<MessageTree>, LogEnabled {
 
 	@Override
 	public void initialize(Class<?> type, String name, Date timestamp) throws IOException {
-		String ipAddress = InetAddress.getLocalHost().getHostAddress();
+		//String ipAddress = InetAddress.getLocalHost().getHostAddress();
+		String ipAddress = LocalIP.getAddress();
 		String logicalPath = m_pathBuilder.getMessagePath(name, timestamp);
 
 		// TODO make it lazy

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.2.0-SNAPSHOT</version>
+	<version>0.2.0</version>
 	<name>Tracking</name>
 	<packaging>pom</packaging>
 	<modules>
@@ -18,17 +18,17 @@
 			<dependency>
 				<groupId>com.dianping.cat</groupId>
 				<artifactId>cat-core</artifactId>
-				<version>0.2.0-SNAPSHOT</version>
+				<version>0.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.dianping.cat</groupId>
 				<artifactId>cat-consumer</artifactId>
-				<version>0.2.0-SNAPSHOT</version>
+				<version>0.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.dianping.cat</groupId>
 				<artifactId>cat-job</artifactId>
-				<version>0.2.0-SNAPSHOT</version>
+				<version>0.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.site.common</groupId>