Merge pull request #651 from jialinsun/master

fix broker service bug

cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java

@@ -176,7 +176,7 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 				m_logger.error(e.getMessage(), e);
 			}
 		} else {
-			Cat.logEvent("InvalidPar", items[4], Event.SUCCESS, items[4]);
+			Cat.logEvent("InvalidRecord", record, Event.SUCCESS, record);
 		}
 	}
 

cat-broker/src/test/java/com/dianping/cat/broker/SingleTest.java

+package com.dianping.cat.broker;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.junit.Test;
+
+public class SingleTest {
+
+	@Test
+	public void test() throws Exception {
+		while (true) {
+			for (int i = 0; i < 10; i++) {
+				URL url = new URL(buildUrl(i));
+				URLConnection URLconnection = url.openConnection();
+				URLconnection.setRequestProperty("User-Agent",
+				      "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Maxthon;)");
+
+				HttpURLConnection httpConnection = (HttpURLConnection) URLconnection;
+				int responseCode = httpConnection.getResponseCode();
+
+				if (responseCode == HttpURLConnection.HTTP_OK) {
+					System.out.println("ok");
+				} else {
+					System.out.println(responseCode);
+				}
+			}
+			Thread.sleep(1000);
+		}
+
+	}
+
+	private String buildUrl(int i) {
+		StringBuilder sb = new StringBuilder(128);
+		sb.append("http://localhost:2765/broker-service/api/single?v=1&ts=123456&tu=http://j1.s1.dpfile.com/lib/1.0/cdn-perf/res/cdn_small.png/dnsLookup&d=1000&hs=200&ec=100");
+
+		return sb.toString();
+	}
+
+	// @Test
+	// public void test2() throws Exception{
+	// for (int i = 0; i < 1000; i++) {
+	// URL url = new URL("http://localhost:2281/cat/r/jsError?error=Script%20error.&file=&line=0&timestamp=1371196520045");
+	// URLConnection URLconnection = url.openConnection();
+	// URLconnection.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Maxthon;)");
+	// URLconnection.setRequestProperty("referer", "http://www.dianping.com/shop/2340226");
+	//
+	// HttpURLConnection httpConnection = (HttpURLConnection) URLconnection;
+	// int responseCode = httpConnection.getResponseCode();
+	//
+	// if (responseCode == HttpURLConnection.HTTP_OK) {
+	// } else {
+	// }
+	// Thread.sleep(100);
+	// }
+
+	// }
+
+}

cat-home/src/main/java/com/dianping/cat/report/page/app/display/AppGraphCreator.java

@@ -177,9 +177,9 @@ public class AppGraphCreator {
 				title = code.getName();
 				int status = code.getStatus();
 				if (status == 0) {
-					title += "<span class='text-success'>&nbsp;&nbsp;【成功】</span>";
+					title += "<span class='text-success'>【成功】</span>";
 				} else {
-					title += "<span class='text-error'>&nbsp;&nbsp;【失败】</span>";
+					title += "<span class='text-error'>【失败】</span>";
 				}
 			}
 			break;

cat-home/src/main/webapp/jsp/report/app/linechart.jsp

@@ -143,7 +143,7 @@
 			var query2 = "";
 			var value = document.getElementById("checkbox").checked;
 
-			if (value == true) {
+			if (value) {
 				var time2 = $("#time2").val();
 				var command2 = $("#command2").val();
 				var code2 = $("#code2").val();