Merge branch 'master' of https://github.com/dianping/cat

cat-client/src/main/java/com/dianping/cat/configuration/ClientConfigManager.java

@@ -159,7 +159,7 @@ public class ClientConfigManager implements LogEnabled {
 			for (Server server : servers) {
 				Integer httpPort = server.getHttpPort();
 
-				if (httpPort == null) {
+				if (httpPort == null || httpPort == 0) {
 					httpPort = 8080;
 				}
 				return String.format("http://%s:%d/cat/s/router?domain=%s", server.getIp(), httpPort, getDomain().getId());

cat-client/src/main/java/com/dianping/cat/message/io/ChannelManager.java

@@ -24,6 +24,7 @@ import org.unidal.helper.Files;
 import org.unidal.helper.Threads;
 import org.unidal.helper.Threads.Task;
 import org.unidal.helper.Urls;
+import org.unidal.lookup.util.StringUtils;
 import org.unidal.tuple.Pair;
 
 import com.dianping.cat.configuration.ClientConfigManager;
@@ -59,7 +60,7 @@ public class ChannelManager implements Task {
 
 	private MessageQueue m_queue;
 
-	private String m_lastServers;
+	private String m_activeServerConfig;
 
 	public ChannelManager(Logger logger, List<InetSocketAddress> serverAddresses, MessageQueue queue,
 	      ClientConfigManager configManager) {
@@ -84,16 +85,14 @@ public class ChannelManager implements Task {
 
 		m_bootstrap = bootstrap;
 
-		String serverConfig = getServerConfig();
+		String serverConfig = loadServerConfig();
 
 		if (serverConfig != null) {
-			List<InetSocketAddress> newAddress = parse(serverConfig);
+			List<InetSocketAddress> configedAddresses = parseSocketAddress(serverConfig);
 
-			initChannel(newAddress);
-			m_lastServers = serverConfig;
+			initChannel(configedAddresses, serverConfig);
 		} else {
-			initChannel(serverAddresses);
-			m_lastServers = null;
+			initChannel(serverAddresses, null);
 		}
 	}
 
@@ -148,20 +147,7 @@ public class ChannelManager implements Task {
 		return "TcpSocketSender-ChannelManager";
 	}
 
-	private String getServerConfig() {
-		try {
-			String url = m_configManager.getServerConfigUrl();
-			InputStream currentServer = Urls.forIO().readTimeout(3000).connectTimeout(1000).openStream(url);
-			String content = Files.forIO().readFrom(currentServer, "utf-8");
-
-			return content.trim();
-		} catch (Exception e) {
-
-		}
-		return null;
-	}
-
-	private void initChannel(List<InetSocketAddress> addresses) {
+	private void initChannel(List<InetSocketAddress> addresses, String serverConfig) {
 		try {
 			StringBuilder sb = new StringBuilder();
 
@@ -179,11 +165,12 @@ public class ChannelManager implements Task {
 				if (future != null) {
 					m_activeFuture = future;
 					m_activeIndex = i;
+					m_activeServerConfig = serverConfig;
 					break;
 				}
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			m_logger.error(e.getMessage(), e);
 			// ignore
 		}
 	}
@@ -208,7 +195,20 @@ public class ChannelManager implements Task {
 		}
 	}
 
-	private List<InetSocketAddress> parse(String content) {
+	private String loadServerConfig() {
+		try {
+			String url = m_configManager.getServerConfigUrl();
+			InputStream currentServer = Urls.forIO().readTimeout(2000).connectTimeout(1000).openStream(url);
+			String content = Files.forIO().readFrom(currentServer, "utf-8");
+
+			return content.trim();
+		} catch (Exception e) {
+			m_logger.error(e.getMessage(), e);
+		}
+		return null;
+	}
+
+	private List<InetSocketAddress> parseSocketAddress(String content) {
 		try {
 			List<String> strs = Splitters.by(";").noEmptyItem().split(content);
 			List<InetSocketAddress> address = new ArrayList<InetSocketAddress>();
@@ -229,6 +229,7 @@ public class ChannelManager implements Task {
 	public void run() {
 		while (m_active) {
 			m_count++;
+
 			if (shouldCheckServerConfig(m_count)) {
 				Pair<Boolean, String> pair = serverConfigChanged();
 
@@ -236,10 +237,9 @@ public class ChannelManager implements Task {
 					closeAllChannel();
 
 					String servers = pair.getValue();
-					List<InetSocketAddress> serverAddresses = parse(servers);
+					List<InetSocketAddress> serverAddresses = parseSocketAddress(servers);
 
-					initChannel(serverAddresses);
-					m_lastServers = servers;
+					initChannel(serverAddresses, servers);
 				}
 			}
 
@@ -288,9 +288,9 @@ public class ChannelManager implements Task {
 	}
 
 	private Pair<Boolean, String> serverConfigChanged() {
-		String current = getServerConfig();
+		String current = loadServerConfig();
 
-		if (current != null && !current.equals(m_lastServers)) {
+		if (!StringUtils.isEmpty(current) && !current.equals(m_activeServerConfig)) {
 			return new Pair<Boolean, String>(true, current);
 		} else {
 			return new Pair<Boolean, String>(false, current);
@@ -298,9 +298,9 @@ public class ChannelManager implements Task {
 	}
 
 	private boolean shouldCheckServerConfig(int count) {
-		int duration = 3600;
+		int duration = 60 * 5;
 
-		if (count % (duration) == 0) {
+		if (count % (duration) == 0 || m_activeIndex == -1) {
 			return true;
 		} else {
 			return false;

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/AllTests.java

@@ -36,7 +36,7 @@ DependencyAnalyzerTest.class,
 
 DependencyReportMergerTest.class,
 
-ProductLineConfigManagerTest.class,
+ProductLineConfigManagerTest.class
 
 })
 public class AllTests {

cat-core/src/main/java/com/dianping/cat/DomainManager.java

@@ -69,7 +69,7 @@ public class DomainManager implements Initializable, LogEnabled {
 	public void enableLogging(Logger logger) {
 		m_logger = logger;
 	}
-
+	
 	@Override
 	public void initialize() throws InitializationException {
 		if (!m_manager.isLocalMode()) {

cat-home/src/main/java/com/dianping/cat/report/service/impl/RouterConfigService.java

@@ -23,11 +23,7 @@ public class RouterConfigService extends AbstractReportService<RouterConfig> {
 
 	@Override
 	public RouterConfig makeReport(String domain, Date start, Date end) {
-		RouterConfig report = new RouterConfig(domain);
-
-		report.setStartTime(start);
-		report.setEndTime(end);
-		return report;
+		return null;
 	}
 
 	@Override

cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java

 package com.dianping.cat.report.task.alert.business;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -53,16 +54,16 @@ public class BusinessAlert extends BaseAlert implements Task, LogEnabled {
 			String domain = config.getDomain();
 			String metric = config.getMetricKey();
 			String metricKey = m_metricConfigManager.buildMetricKey(domain, config.getType(), metric);
-
-			List<AlertResultEntity> alertResults = null;
+			List<AlertResultEntity> alertResults = new ArrayList<AlertResultEntity>();
+			
 			if (config.isShowAvg()) {
-				alertResults = computeAlertInfo(minute, product, metricKey, MetricType.AVG);
+				alertResults.addAll(computeAlertInfo(minute, product, metricKey, MetricType.AVG));
 			}
 			if (config.isShowCount()) {
-				alertResults = computeAlertInfo(minute, product, metricKey, MetricType.COUNT);
+				alertResults.addAll(computeAlertInfo(minute, product, metricKey, MetricType.COUNT));
 			}
 			if (config.isShowSum()) {
-				alertResults = computeAlertInfo(minute, product, metricKey, MetricType.SUM);
+				alertResults.addAll(computeAlertInfo(minute, product, metricKey, MetricType.SUM));
 			}
 
 			for (AlertResultEntity alertResult : alertResults) {
@@ -70,8 +71,9 @@ public class BusinessAlert extends BaseAlert implements Task, LogEnabled {
 				String metricName = buildMetricName(metricKey);
 
 				AlertEntity entity = new AlertEntity();
-				
-				entity.setDate(alertResult.getAlertTime()).setContent(alertResult.getContent()).setLevel(alertResult.getAlertLevel());
+
+				entity.setDate(alertResult.getAlertTime()).setContent(alertResult.getContent())
+				      .setLevel(alertResult.getAlertLevel());
 				entity.setMetric(metricName).setType(getName()).setGroup(product);
 
 				m_sendManager.addAlert(entity);

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/SmsSender.java

@@ -19,7 +19,7 @@ import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
 public class SmsSender implements Sender, LogEnabled {
 
 	public static final String ID = AlertConstants.SMS;
-
+	
 	private Logger m_logger;
 
 	@Override

cat-home/src/main/java/com/dianping/cat/report/task/router/RouterConfigBuilder.java

@@ -37,31 +37,94 @@ public class RouterConfigBuilder implements ReportTaskBuilder {
 	@Inject
 	private RouterConfigManager m_configManager;
 
+	private boolean needRebuild(StateReport report, RouterConfig config) {
+		if (config != null) {
+			Map<String, Long> serverProcesses = new LinkedHashMap<String, Long>();
+			StateReportVisitor visitor = new StateReportVisitor();
+			visitor.visitStateReport(report);
+
+			Map<String, Long> numbers = visitor.getNumbers();
+
+			for (Entry<String, Long> entry : numbers.entrySet()) {
+				String domain = entry.getKey();
+				Long count = entry.getValue();
+				Domain serverConfig = config.findDomain(domain);
+
+				if (serverConfig != null) {
+					Server server = serverConfig.getServers().get(0);
+					String serverId = server.getId();
+					Long value = serverProcesses.get(serverId);
+
+					if (value == null) {
+						serverProcesses.put(serverId, count);
+					} else {
+						serverProcesses.put(serverId, count + value);
+					}
+				}
+			}
+
+			long min = Integer.MAX_VALUE;
+			long max = Integer.MIN_VALUE;
+
+			for (Entry<String, Long> entry : serverProcesses.entrySet()) {
+				long value = entry.getValue();
+
+				if (value > max) {
+					max = value;
+				}
+				if (value < min) {
+					min = value;
+				}
+			}
+
+			if (max * 1.0 / min > 1.4) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return true;
+		}
+	}
+
 	@Override
 	public boolean buildDailyTask(String name, String domain, Date period) {
+		Date yesterday = new Date(period.getTime() - TimeUtil.ONE_DAY);
+		RouterConfig yesterdayConfig = m_reportService.queryRouterConfigReport(Constants.CAT, yesterday, period);
 		Date start = period;
 		Date end = new Date(start.getTime() + TimeUtil.ONE_DAY);
 		StateReport report = m_reportService.queryStateReport(Constants.CAT, start, end);
-		StateReportVisitor visitor = new StateReportVisitor();
-		RouterConfig routerConfig = new RouterConfig(Constants.CAT);
 
-		routerConfig.setStartTime(period);
-		routerConfig.setEndTime(new Date(period.getTime() + TimeUtil.ONE_DAY));
-		visitor.visitStateReport(report);
+		boolean need = needRebuild(report, yesterdayConfig);
+		RouterConfig routerConfig;
 
-		Map<String, Long> numbers = visitor.getNumbers();
-		Comparator<Entry<String, Long>> compator = new Comparator<Map.Entry<String, Long>>() {
+		if (need) {
+			routerConfig = new RouterConfig(Constants.CAT);
+			StateReportVisitor visitor = new StateReportVisitor();
 
-			@Override
-			public int compare(Entry<String, Long> o1, Entry<String, Long> o2) {
-				return (int) (o2.getValue() - o1.getValue());
-			}
-		};
-		numbers = MapUtils.sortMap(numbers, compator);
-		Map<Server, Long> servers = findAvaliableServers();
+			routerConfig.setStartTime(period);
+			routerConfig.setEndTime(new Date(period.getTime() + TimeUtil.ONE_DAY));
+			visitor.visitStateReport(report);
+
+			Map<String, Long> numbers = visitor.getNumbers();
+			Comparator<Entry<String, Long>> compator = new Comparator<Map.Entry<String, Long>>() {
 
-		processMainServer(servers, routerConfig, numbers);
-		processBackServer(servers, routerConfig, numbers);
+				@Override
+				public int compare(Entry<String, Long> o1, Entry<String, Long> o2) {
+					return (int) (o2.getValue() - o1.getValue());
+				}
+			};
+			numbers = MapUtils.sortMap(numbers, compator);
+			Map<Server, Long> servers = findAvaliableServers();
+
+			processMainServer(servers, routerConfig, numbers);
+			processBackServer(servers, routerConfig, numbers);
+		} else {
+			System.err.println("no need change");
+			routerConfig = yesterdayConfig;
+			routerConfig.setStartTime(start);
+			routerConfig.setEndTime(end);
+		}
 
 		DailyReport dailyReport = new DailyReport();
 

cat-home/src/main/java/com/dianping/cat/system/config/RouterConfigManager.java

@@ -57,7 +57,7 @@ public class RouterConfigManager implements Initializable, LogEnabled {
 			Map<Server, Integer> map = new HashMap<Server, Integer>();
 			List<Server> servers = queryEnableServers();
 			int length = servers.size();
-			int index = (int) (Math.random() * length);
+			int index = domain.hashCode() * length;
 
 			for (int i = 0; i < 2; i++) {
 				map.put(servers.get((index + 1) % length), 0);

cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java

@@ -67,7 +67,9 @@ public class Handler implements PageHandler<Context> {
 				}
 				model.setContent(str);
 			} else {
-				model.setContent("");
+				List<Server> servers = m_configManager.queryServersByDomain(payload.getDomain());
+
+				model.setContent(buildServerStr(servers));
 			}
 			break;
 		case MODEL:

cat-home/src/main/java/com/dianping/cat/system/page/router/JspFile.java

 package com.dianping.cat.system.page.router;
 
 public enum JspFile {
-	API("/jsp/system/router/router.jsp"),
+	API("/jsp/system/router/api.jsp"),
 	
 	MODEL("/jsp/system/router/router.jsp"),
 

cat-home/src/main/resources/config/default-alert-policy.xml

@@ -7,7 +7,7 @@
 	</type>
 	<type id="exception">
 		<group id="default">
-			<level id="error" send="mail,weixin,sms" />
+			<level id="error" send="mail,weixin" />
 			<level id="warning" send="mail,weixin" />
 		</group>
 	</type>

cat-home/src/main/webapp/jsp/system/router/api.jsp

+<%@ page contentType="text/html; charset=utf-8" %>
+<jsp:useBean id="model" type="com.dianping.cat.system.page.router.Model" scope="request"/>
+${model.content}
\ No newline at end of file

cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java

@@ -3,34 +3,52 @@ package com.dianping.cat.report.analyzer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import junit.framework.Assert;
+
 import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.core.dal.Task;
-import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.router.entity.RouterConfig;
 import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.report.task.spi.ReportFacade;
 
 public class RouterBuilderTest extends ComponentTestCase {
 
+	public String day1 = "2014-07-25";
+
+	public String day2 = "2014-07-26";
+
+	public String day3 = "2014-07-27";
+
+	public String day4 = "2014-07-28";
+
 	@Test
 	public void test() throws Exception {
 		ReportFacade reportFacade = (ReportFacade) lookup(ReportFacade.class);
 		Task task = new Task();
-		Date reportPeriod = new SimpleDateFormat("yyyy-MM-dd").parse("2014-07-28");
-		
+		Date reportPeriod = new SimpleDateFormat("yyyy-MM-dd").parse(day3);
+
 		task.setReportName(Constants.REPORT_ROUTER);
 		task.setReportPeriod(reportPeriod);
 		task.setReportDomain(Constants.CAT);
 		task.setTaskType(1);
-		reportFacade.builderReport(task );
-		
-		ReportServiceManager manager = (ReportServiceManager) lookup(ReportServiceManager.class);
-		RouterConfig report = manager.queryRouterConfigReport(Constants.CAT, reportPeriod, new Date(reportPeriod.getTime()+TimeUtil.ONE_DAY));
-		
-		System.err.println(report);
+		reportFacade.builderReport(task);
+
+		task.setReportPeriod(new SimpleDateFormat("yyyy-MM-dd").parse(day4));
+		reportFacade.builderReport(task);
 	}
 
+	@Test
+	public void test1() throws Exception {
+		ReportServiceManager service = lookup(ReportServiceManager.class);
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		RouterConfig report1 = service.queryRouterConfigReport(Constants.CAT, sdf.parse(day3), sdf.parse(day4));
+
+		RouterConfig report2 = service.queryRouterConfigReport(Constants.CAT, sdf.parse(day3), sdf.parse(day4));
+
+		Assert.assertEquals(report1.toString(), report2.toString());
+	}
+	
 }