Merge branch 'master' of code.dianpingoa.com:arch/cat

matieli · Mar 10, 2015 · 2d1e6ec · 2d1e6ec
2 parents aae2dbc + a956222
commit 2d1e6ec
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 24 deletions.
diff --git a/cat-agent/pom.xml b/cat-agent/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>com.dianping.cat</groupId>
       <artifactId>parent</artifactId>
-      <version>1.2.9</version>
+      <version>1.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>cat-agent</artifactId>

diff --git a/cat-broker/pom.xml b/cat-broker/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>broker-service</artifactId>

diff --git a/cat-client/pom.xml b/cat-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-client</artifactId>

diff --git a/cat-client/src/main/java/com/dianping/cat/Cat.java b/cat-client/src/main/java/com/dianping/cat/Cat.java
@@ -32,17 +32,20 @@
 public class Cat {
 	private static Cat s_instance = new Cat();
 
+	private static volatile boolean s_init = false;
+
 	private MessageProducer m_producer;
 
 	private MessageManager m_manager;
 
 	private PlexusContainer m_container;
 
 	private static void checkAndInitialize() {
-		if (s_instance.m_container == null) {
+		if (!s_init) {
 			synchronized (s_instance) {
-				if (s_instance.m_container == null) {
+				if (!s_init) {
 					initialize(new File(getCatHome(), "client.xml"));
+					s_init = true;
 					log("WARN", "Cat is lazy initialized!");
 				}
 			}
@@ -150,7 +153,7 @@ public static void logHeartbeat(String type, String name, String status, String
 	}
 
 	public static void logMetric(String name, Object... keyValues) {
-		//TO REMOVE ME
+		// TO REMOVE ME
 	}
 
 	/**
@@ -269,21 +272,14 @@ private Cat() {
 	}
 
 	void setContainer(PlexusContainer container) {
-		m_container = container;
-
 		try {
+			m_container = container;
 			m_manager = container.lookup(MessageManager.class);
-		} catch (ComponentLookupException e) {
-			throw new RuntimeException("Unable to get instance of MessageManager, "
-			      + "please make sure the environment was setup correctly!", e);
-		}
-
-		try {
 			m_producer = container.lookup(MessageProducer.class);
 		} catch (ComponentLookupException e) {
-			throw new RuntimeException("Unable to get instance of MessageProducer, "
+			throw new RuntimeException("Unable to get instance of MessageManager, "
 			      + "please make sure the environment was setup correctly!", e);
 		}
 	}
-	
+
 }
diff --git a/cat-client/src/main/java/com/dianping/cat/message/spi/codec/PlainTextMessageCodec.java b/cat-client/src/main/java/com/dianping/cat/message/spi/codec/PlainTextMessageCodec.java
@@ -105,7 +105,7 @@ protected void decodeHeader(Context ctx, MessageTree tree) {
 			throw new RuntimeException(String.format("Unrecognized id(%s) for plain text message codec!", id));
 		}
 	}
-
+	
 	protected Message decodeLine(Context ctx, DefaultTransaction parent, Stack<DefaultTransaction> stack,
 	      MessageTree tree) {
 		BufferHelper helper = m_bufferHelper;

diff --git a/cat-consumer/pom.xml b/cat-consumer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-consumer</artifactId>

diff --git a/cat-core/pom.xml b/cat-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-core</artifactId>

diff --git a/cat-hadoop/pom.xml b/cat-hadoop/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-hadoop</artifactId>

diff --git a/cat-home/pom.xml b/cat-home/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-home</artifactId>

diff --git a/cat-maven-plugin/pom.xml b/cat-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.9</version>
+		<version>1.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.2.9</version>
+	<version>1.3.0</version>
 	<name>parent</name>
 	<description>Central Application Tracking</description>
 	<packaging>pom</packaging>
@@ -174,7 +174,7 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 			<plugin>
 				<groupId>com.dianping.cat</groupId>
 				<artifactId>cat-maven-plugin</artifactId>
-				<version>1.2.9</version>
+				<version>1.3.0</version>
 			</plugin>
 		</plugins>
 	</build>