diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java index ad10bbeb00a0bc447ca61791db768c646cebedbf..392b386366211a2be007b29fca8e944448dd21f5 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java @@ -29,6 +29,6 @@ public class DefaultAnalyzerFactory extends ContainerHolder implements AnalyzerF @Override public void release(Object component) { - release(component); + super.release(component); } } diff --git a/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerStoreTest.java b/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerStoreTest.java index 3114b7c63e3d49f368847d632d2250d16327c06d..f6eefbb519bf111446c335c30f683387c62c7375 100644 --- a/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerStoreTest.java +++ b/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerStoreTest.java @@ -55,7 +55,7 @@ public class FailureAnalyzerStoreTest extends ComponentTestCase { tree.setMessage(t); tree.setIpAddress("192.168.8." + i % 4); t.setDuration(3 * 1000); - t.setTimestamp(start + 1000 * 60 * i); + t.setTimestamp(start + 1000L * 60 * i); analyzer.process(tree); analyzer.process(tree); analyzer.process(tree); @@ -95,7 +95,7 @@ public class FailureAnalyzerStoreTest extends ComponentTestCase { tree.setHostName("middleware"); tree.setMessage(t); t.setDuration(3 * 1000); - t.setTimestamp(start + 1000 * 60 * i); + t.setTimestamp(start + 1000L * 60 * i); analyzer.process(tree); } diff --git a/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerTest.java b/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerTest.java index 6e320b4196662108bd81af6b9241c79364a012a5..5fef5e73397773f86e71ae6107b1f0c065f70a5a 100644 --- a/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerTest.java +++ b/cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerTest.java @@ -112,9 +112,10 @@ public class FailureAnalyzerTest extends ComponentTestCase { if (entries == null) { System.out.println(minuteStr); + } else { + assertEquals("Check the segment size ", 50, entries.size()); } - - assertEquals("Check the segment size ", 50, entries.size()); + startDate.setTime(startDate.getTime() + 1000 * 60); } } @@ -139,7 +140,7 @@ public class FailureAnalyzerTest extends ComponentTestCase { tree.setIpAddress("127.0.0." + i); tree.setMessage(t); t.setDuration(3 * 1000); - t.setTimestamp(start + 1000 * 60 * i); + t.setTimestamp(start + 1000L * 60 * i); analyzer.process(tree); // analyzer.process(tree); } diff --git a/cat-core/src/main/java/com/dianping/cat/configuration/model/ClientConfigValidator.java b/cat-core/src/main/java/com/dianping/cat/configuration/model/ClientConfigValidator.java index 39960e8e41d8c1f366241c66fb50b756d13e57dd..ca9094e6294289a5773994b0a99671f7c00c9e98 100644 --- a/cat-core/src/main/java/com/dianping/cat/configuration/model/ClientConfigValidator.java +++ b/cat-core/src/main/java/com/dianping/cat/configuration/model/ClientConfigValidator.java @@ -7,7 +7,7 @@ public class ClientConfigValidator extends DefaultValidator { @Override public void visitConfig(Config config) { if (!"client".equals(config.getMode())) { - throw new RuntimeException(String.format("Attribute(%)s at path(%s) is required!", "mode", "/config")); + throw new RuntimeException(String.format("Attribute(%s) at path(%s) is required!", "mode", "/config")); } else if (config.getApp() == null) { throw new RuntimeException(String.format("Element(%s) at path(%s) is required!", "app", "/config")); } else if (config.getServers().size() == 0) { diff --git a/cat-core/src/main/java/com/dianping/cat/message/io/TcpSocketReceiver.java b/cat-core/src/main/java/com/dianping/cat/message/io/TcpSocketReceiver.java index 2843425bc5d5ec9d2f47a4a59055c3d0a4d8a222..1d55d38011e9bacc9f50aecb5ff11cbeecd1659b 100644 --- a/cat-core/src/main/java/com/dianping/cat/message/io/TcpSocketReceiver.java +++ b/cat-core/src/main/java/com/dianping/cat/message/io/TcpSocketReceiver.java @@ -105,7 +105,7 @@ public class TcpSocketReceiver implements MessageReceiver, LogEnabled { m_factory.releaseExternalResources(); } - public class MyDecoder extends FrameDecoder { + public static class MyDecoder extends FrameDecoder { @Override /** * return null means not all data is ready, so waiting for next network package. diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java index a3258a58c42947a2e62a72cf99012262c07d3c0e..8008b03b89049d0847690e88e24a9a2a66e5f9b1 100644 --- a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java +++ b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java @@ -80,7 +80,7 @@ public class HtmlMessageCodec implements MessageCodec { if (counter != null) { counter.inc(); - count += helper.tr1(buf, counter.getCount() % 2 == 1 ? "odd" : "even"); + count += helper.tr1(buf, counter.getCount() % 2 != 0 ? "odd" : "even"); } else { count += helper.tr1(buf, null); } diff --git a/cat-home/src/test/java/com/dianping/cat/demo/Demo.java b/cat-home/src/test/java/com/dianping/cat/demo/Demo.java index 37c1481cacdcf250c925937123a2414765921afe..d80776750e8e84ec29a6c020d113f11db361d28e 100644 --- a/cat-home/src/test/java/com/dianping/cat/demo/Demo.java +++ b/cat-home/src/test/java/com/dianping/cat/demo/Demo.java @@ -1,6 +1,7 @@ package com.dianping.cat.demo; import java.io.File; +import java.util.Random; import org.junit.After; import org.junit.Before; @@ -44,16 +45,16 @@ public class Demo extends ComponentTestCase { cat.logEvent("RuntimeException", RuntimeException.class.getName(), "ERROR", null); cat.logEvent("Exception", Exception.class.getName(), "ERROR", null); cat.logEvent("RuntimeException", NullPointerException.class.getName(), "ERROR", null); - - t.setStatus("0"); + Thread.sleep(new Random().nextInt(10) * new Random().nextInt(3)); + t.setStatus("error"); t.complete(); } @Test public void demo2() throws Exception { MessageProducer cat = lookup(MessageProducer.class); - Transaction t = cat.newTransaction("SQL", "update-user"); - + Transaction t = cat.newTransaction("SQL3", "update-user"); + Thread.sleep(10); t.setStatus("error"); t.complete(); }