refactor cat server config

cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/DomainManager.java

@@ -98,7 +98,7 @@ public class DomainManager implements Initializable, LogEnabled {
 	public class ReloadDomainTask implements Task {
 		@Override
 		public String getName() {
-			return "Reload-Ip-DomainInfo";
+			return "Reload-CMDB-Ip-Domain-Info";
 		}
 
 		public String parseIp(String content) throws Exception {

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

@@ -31,7 +31,7 @@ public class CatCoreModule extends AbstractModule {
 		// disable thread renaming of Netty
 		ThreadRenamingRunnable.setThreadNameDeterminer(ThreadNameDeterminer.CURRENT);
 		// tracking thread start/stop
-		//Threads.addListener(new CatThreadListener(ctx));
+		Threads.addListener(new CatThreadListener(ctx));
 		File clientConfigFile = ctx.getAttribute("cat-client-config-file");
 		ClientConfigManager clientConfigManager = ctx.lookup(ClientConfigManager.class);
 

cat-core/src/main/java/com/dianping/cat/configuration/ServerConfigManager.java

@@ -230,6 +230,18 @@ public class ServerConfigManager implements LogEnabled {
 		}
 	}
 
+	public boolean isConsumerMachine(){
+		return m_config.isConsumerMachine();
+	}
+	
+	public boolean isConsoleMachine(){
+		return m_config.isConsoleMachine();
+	}
+	
+	public boolean isAlarmMachine(){
+		return m_config.isAlarmMachine();
+	}
+	
 	private long toLong(String str, long defaultValue) {
 		long value = 0;
 		int len = str == null ? 0 : str.length();

cat-core/src/main/resources/META-INF/dal/model/server-model.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <model model-package="com.dianping.cat.configuration.server" enable-sax-parser="true" enable-validator="true">
 	<entity name="config" class-name="ServerConfig">
-		<attribute name="local-mode" value-type="boolean" default-value="true"/>
-		<attribute name="job-machine" value-type="boolean" default-value="false"/>
+		<attribute name="local-mode" value-type="boolean"  primitive="true" default-value="true"/>
+		<attribute name="job-machine" value-type="boolean"  primitive="true" default-value="false"/>
+		<attribute name="alarm-machine" value-type="boolean"  primitive="true" default-value="false"/>
+		<attribute name="console-machine" value-type="boolean"  primitive="true" default-value="false"/>
+		<attribute name="consumer-machine" value-type="boolean"  primitive="true" default-value="true"/>
 	</entity>
 	<entity name="storage" class-name="StorageConfig">
 		<attribute name="local-base-dir" value-type="String" default-value="target/bucket" />

cat-home/src/main/java/com/dianping/cat/CatHomeModule.java

@@ -38,10 +38,10 @@ public class CatHomeModule extends AbstractModule {
 		ctx.lookup(DomainNavManager.class);
 		ctx.lookup(AggregationConfigManager.class);
 
-		DefaultTaskConsumer taskConsumer = ctx.lookup(DefaultTaskConsumer.class);
-		TaskProducer dailyTaskProducer = ctx.lookup(TaskProducer.class);
-
 		if (serverConfigManager.isJobMachine() && !serverConfigManager.isLocalMode()) {
+			DefaultTaskConsumer taskConsumer = ctx.lookup(DefaultTaskConsumer.class);
+			TaskProducer dailyTaskProducer = ctx.lookup(TaskProducer.class);
+
 			Threads.forGroup("Cat").start(taskConsumer);
 			Threads.forGroup("Cat").start(dailyTaskProducer);
 		}
@@ -65,7 +65,7 @@ public class CatHomeModule extends AbstractModule {
 		AlarmRuleCreator alarmCreatorTask = ctx.lookup(AlarmRuleCreator.class);
 		ScheduledMailTask scheduledTask = ctx.lookup(ScheduledMailTask.class);
 
-		if (serverConfigManager.isJobMachine() && !serverConfigManager.isLocalMode()) {
+		if (serverConfigManager.isAlarmMachine() && !serverConfigManager.isLocalMode()) {
 			Threads.forGroup("Cat").start(exceptionAlarmTask);
 			Threads.forGroup("Cat").start(alarmCreatorTask);
 			Threads.forGroup("Cat").start(scheduledTask);

cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java

@@ -178,7 +178,7 @@ public class TopologyGraphManager implements Initializable, LogEnabled {
 
 	@Override
 	public void initialize() throws InitializationException {
-		if (!m_manager.isLocalMode() && m_manager.isJobMachine()) {
+		if (!m_manager.isLocalMode() && m_manager.isConsoleMachine()) {
 			Threads.forGroup("Cat").start(new Reload());
 		}
 	}

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

@@ -61,7 +61,7 @@ public class MonthReportCache implements Initializable {
 
 	@Override
 	public void initialize() throws InitializationException {
-		if (m_serverConfigManager.isJobMachine()) {
+		if (m_serverConfigManager.isConsoleMachine()) {
 			Threads.forGroup("Cat").start(new Reload());
 		}
 	}

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

@@ -61,7 +61,7 @@ public class WeeklyReportCache implements Initializable {
 
 	@Override
 	public void initialize() throws InitializationException {
-		if (m_serverConfigManager.isJobMachine()) {
+		if (m_serverConfigManager.isConsoleMachine()) {
 			Threads.forGroup("Cat").start(new Reload());
 		}
 	}

cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java

@@ -80,7 +80,7 @@ public class DomainNavManager implements Initializable {
 	@Override
 	public void initialize() throws InitializationException {
 		reloadDomainInfo();
-		if (!m_serverConfigManager.isLocalMode()) {
+		if (!m_serverConfigManager.isLocalMode()&&m_serverConfigManager.isConsoleMachine()) {
 			Threads.forGroup("Cat").start(new DomainReload());
 		}
 	}

cat-home/src/main/java/com/dianping/cat/system/alarm/alert/AlertManager.java

@@ -36,7 +36,7 @@ public class AlertManager implements Initializable {
 
 	@Override
 	public void initialize() throws InitializationException {
-		if (m_configManager.isJobMachine() && !m_configManager.isLocalMode()) {
+		if (m_configManager.isAlarmMachine() && !m_configManager.isLocalMode()) {
 			SendAlarmTask sendAlarmTask = new SendAlarmTask();
 
 			Threads.forGroup("Cat").start(sendAlarmTask);

cat-home/src/main/java/com/dianping/cat/system/alarm/threshold/ThresholdRuleManager.java

@@ -184,7 +184,7 @@ public class ThresholdRuleManager implements Initializable {
 
 	@Override
 	public void initialize() throws InitializationException {
-		if (m_configManager.isJobMachine() && !m_configManager.isLocalMode()) {
+		if (m_configManager.isAlarmMachine() && !m_configManager.isLocalMode()) {
 			initalizeExceptionRule();
 			initalizeServiceRule();
 

cat-home/src/main/java/com/dianping/cat/system/tool/MailSMSImpl.java

@@ -43,7 +43,7 @@ public class MailSMSImpl implements MailSMS, Initializable, LogEnabled {
 
 	@Override
 	public void initialize() {
-		if (m_serverConfig.isJobMachine() && !m_serverConfig.isLocalMode()) {
+		if (m_serverConfig.isAlarmMachine() && !m_serverConfig.isLocalMode()) {
 			try {
 				ApplicationContext ctx = new ClassPathXmlApplicationContext("spring/remoteService.xml");
 
@@ -63,7 +63,7 @@ public class MailSMSImpl implements MailSMS, Initializable, LogEnabled {
 		}
 		boolean sendResult = false;
 
-		if (m_serverConfig.isJobMachine()) {
+		if (m_serverConfig.isAlarmMachine()) {
 			if (emails.size() > 0) {
 				for (String mail : emails) {
 					try {
@@ -90,7 +90,7 @@ public class MailSMSImpl implements MailSMS, Initializable, LogEnabled {
 		}
 		boolean sendResult = false;
 
-		if (m_serverConfig.isJobMachine()) {
+		if (m_serverConfig.isAlarmMachine()) {
 			if (phones != null && phones.size() > 0) {
 				for (String phone : phones) {
 					m_logger.info("CAT sms send to ! " + phone + " " + content);

cat-home/src/main/webapp/jsp/report/dependency/dependencyTopologyGraph.jsp

@@ -124,7 +124,7 @@
 				},
 			radius:300,
 			sideWeight:function(weight){
-				return weight+1
+				return weight+3
 			},
 			nodeWeight:function(weight){
 				return weight/5+defaultWeight;