From 656575b2c99404377fbd90fbb6a86cdf07dc922a Mon Sep 17 00:00:00 2001 From: youyong Date: Tue, 25 Sep 2012 21:46:43 +0800 Subject: [PATCH] modify the cat --- .../cat/consumer/cross/CrossAnalyzer.java | 68 ++-- .../consumer/heartbeat/HeartbeatAnalyzer.java | 2 +- .../cat/consumer/sql/SqlParseManager.java | 8 +- .../message/spi/AbstractMessageAnalyzer.java | 3 +- .../hadoop/hdfs/HdfsMessageBucketManager.java | 5 +- .../com/dianping/cat/helper/CatString.java | 2 + .../cat/report/page/cache/Handler.java | 6 +- .../cat/report/page/logview/Action.java | 2 +- .../cat/report/page/logview/Handler.java | 20 + .../cat/report/page/logview/JspFile.java | 4 +- .../cat/report/page/logview/JspViewer.java | 2 + .../cat/report/page/logview/Model.java | 11 + .../cat/report/page/task/Handler.java | 18 +- .../cat/report/task/DefaultTaskConsumer.java | 15 +- .../resources/META-INF/plexus/components.xml | 3 + .../main/webapp/jsp/report/logview_detail.jsp | 20 + dog-home/pom.xml | 36 +- .../dog/build/CatDatabaseConfigurator.java | 5 +- .../{report-codegen.xml => alarm-codegen.xml} | 348 +++++++++--------- .../jdbc/{report-dal.xml => alarm-dal.xml} | 0 .../META-INF/dal/jdbc/alarm-manifest.xml | 6 + .../META-INF/dal/jdbc/report-manifest.xml | 6 - .../resources/META-INF/plexus/components.xml | 47 ++- .../resources/META-INF/wizard/jdbc/wizard.xml | 36 +- .../com/dianping/cat/consumer/AllTests.java | 15 + 25 files changed, 395 insertions(+), 293 deletions(-) create mode 100755 cat-home/src/main/webapp/jsp/report/logview_detail.jsp rename dog-home/src/main/resources/META-INF/dal/jdbc/{report-codegen.xml => alarm-codegen.xml} (95%) rename dog-home/src/main/resources/META-INF/dal/jdbc/{report-dal.xml => alarm-dal.xml} (100%) create mode 100644 dog-home/src/main/resources/META-INF/dal/jdbc/alarm-manifest.xml delete mode 100644 dog-home/src/main/resources/META-INF/dal/jdbc/report-manifest.xml create mode 100644 dog-home/src/test/java/com/dianping/cat/consumer/AllTests.java diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java index a075246f1..b32ebdfd2 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java @@ -133,22 +133,33 @@ public class CrossAnalyzer extends AbstractMessageAnalyzer implemen public boolean isIp(String ip) { boolean result = false; + // try { + // if (ip.matches("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}")) { + // String s[] = ip.split("\\."); + // + // if (Integer.parseInt(s[0]) <= 255) { + // if (Integer.parseInt(s[1]) <= 255) { + // if (Integer.parseInt(s[2]) <= 255) { + // if (Integer.parseInt(s[3]) <= 255) { + // result = true; + // } + // } + // } + // } + // } + // } catch (Exception e) { + // //ignore + // } try { - if (ip.matches("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}")) { - String s[] = ip.split("\\."); - - if (Integer.parseInt(s[0]) <= 255) { - if (Integer.parseInt(s[1]) <= 255) { - if (Integer.parseInt(s[2]) <= 255) { - if (Integer.parseInt(s[3]) <= 255) { - result = true; - } - } - } + char first = ip.charAt(0); + char next = ip.charAt(1); + if (first >= '0' && first <= '9') { + if (next >= '0' && next <= '9') { + return true; } } } catch (Exception e) { - //ignore + } return result; } @@ -157,22 +168,23 @@ public class CrossAnalyzer extends AbstractMessageAnalyzer implemen CrossInfo crossInfo = new CrossInfo(); String localIp = tree.getIpAddress(); -// List messages = t.getChildren(); -// for (Message message : messages) { -// if (message instanceof Event) { -// if (message.getType().equals("PigeonService.client")) { -// String name = message.getName(); -// int index = name.indexOf(":"); -// if (index > 0) { -// name = name.substring(0, index); -// } -// if (isIp(name)) { -// crossInfo.setRemoteAddress(name); -// } -// break; -// } -// } -// } + List messages = t.getChildren(); + for (Message message : messages) { + if (message instanceof Event) { + if (message.getType().equals("PigeonService.client")) { + String name = message.getName(); + int index = name.indexOf(":"); + if (index > 0) { + name = name.substring(0, index); + } + if (isIp(name)) { + crossInfo.setRemoteAddress(name); + } + break; + } + } + } + if (crossInfo.getRemoteAddress().equals(UNKNOWN)) { MessageId id = MessageId.parse(tree.getMessageId()); String remoteIp = id.getIpAddress(); diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/heartbeat/HeartbeatAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/heartbeat/HeartbeatAnalyzer.java index 7039ffff1..e18789d0d 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/heartbeat/HeartbeatAnalyzer.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/heartbeat/HeartbeatAnalyzer.java @@ -145,7 +145,7 @@ public class HeartbeatAnalyzer extends AbstractMessageAnalyzer } } } catch (Exception e) { - e.printStackTrace(); + Cat.logError(e); } return period; diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/sql/SqlParseManager.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/sql/SqlParseManager.java index 5b7bf584c..9d507936b 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/sql/SqlParseManager.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/sql/SqlParseManager.java @@ -70,7 +70,13 @@ public class SqlParseManager { } private String parseSql(String sqlStatement) { - List tables = SqlParsers.forTable().parse(sqlStatement); + List tables = null; + try { + tables = SqlParsers.forTable().parse(sqlStatement); + } catch (Exception e) { + Cat.logError(e); + Cat.getProducer().logEvent("Parse", "SQL", "Error", sqlStatement); + } String result = ""; boolean first = true; diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/AbstractMessageAnalyzer.java b/cat-core/src/main/java/com/dianping/cat/message/spi/AbstractMessageAnalyzer.java index 421b4c6c0..748494c33 100644 --- a/cat-core/src/main/java/com/dianping/cat/message/spi/AbstractMessageAnalyzer.java +++ b/cat-core/src/main/java/com/dianping/cat/message/spi/AbstractMessageAnalyzer.java @@ -84,7 +84,8 @@ public abstract class AbstractMessageAnalyzer extends ContainerHolder impleme protected boolean shouldDiscard(Transaction t) { // pigeon default heartbeat is no use - if (("Service").equals(t.getType()) && ("piegonService:heartTaskService:heartBeat").equals(t.getName())) { + if ((("Service").equals(t.getType()) || ("PigeonService").equals(t.getType())) + && ("piegonService:heartTaskService:heartBeat").equals(t.getName())) { return true; } return false; diff --git a/cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java b/cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java index d3f8a7519..7c61a24fb 100644 --- a/cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java +++ b/cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java @@ -80,9 +80,6 @@ public class HdfsMessageBucketManager extends ContainerHolder implements Message final String str = sb.toString(); final Path basePath = new Path(str); final List paths = new ArrayList(); - // final String key = "-" + id.getDomain() + "-"; - - // final String dataFile =path + id.getDomain() + "-" + id.getIpAddress(); fs.listStatus(basePath, new PathFilter() { @Override @@ -97,7 +94,9 @@ public class HdfsMessageBucketManager extends ContainerHolder implements Message } }); + t.addData(paths.toString()); for (String dataFile : paths) { + Cat.getProducer().logEvent("HDFSBucket", dataFile); HdfsMessageBucket bucket = m_buckets.get(dataFile); if (bucket == null) { diff --git a/cat-home/src/main/java/com/dianping/cat/helper/CatString.java b/cat-home/src/main/java/com/dianping/cat/helper/CatString.java index a3dc3d770..373da6534 100644 --- a/cat-home/src/main/java/com/dianping/cat/helper/CatString.java +++ b/cat-home/src/main/java/com/dianping/cat/helper/CatString.java @@ -6,4 +6,6 @@ public class CatString { public static final String ALL_Domain = "All"; public static final String ALL_Database = "All"; + + public static final String ALL_NAME = "All"; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java index 0a80c1d46..65611f22b 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java @@ -375,10 +375,10 @@ public class Handler implements PageHandler { model.setPage(ReportPage.CACHE); model.setDisplayDomain(payload.getDomain()); model.setQueryName(payload.getQueryName()); - if (payload.getPeriod().isCurrent()) { - model.setCreatTime(new Date()); + if (payload.getPeriod().isFuture()) { + model.setLongDate(payload.getCurrentDate()); } else { - model.setCreatTime(new Date(payload.getDate() + 60 * 60 * 1000 - 1000)); + model.setLongDate(payload.getDate()); } if (payload.getAction() == Action.HISTORY_REPORT) { String type = payload.getReportType(); diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Action.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Action.java index a69d8cf2a..f42f3c4a4 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Action.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Action.java @@ -1,7 +1,7 @@ package com.dianping.cat.report.page.logview; public enum Action implements com.site.web.mvc.Action { - MOBILE("mobile"), VIEW("view"); + MOBILE("mobile"), VIEW("view"), DETAIL("detail"); public static Action getByName(String name, Action defaultAction) { for (Action action : Action.values()) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java index 912530e9b..34c02ca34 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java @@ -1,11 +1,13 @@ package com.dianping.cat.report.page.logview; import java.io.IOException; +import java.util.Date; import javax.servlet.ServletException; import com.dianping.cat.Cat; import com.dianping.cat.message.internal.MessageId; +import com.dianping.cat.message.spi.MessagePathBuilder; import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.page.model.spi.ModelPeriod; import com.dianping.cat.report.page.model.spi.ModelRequest; @@ -24,6 +26,9 @@ public class Handler implements PageHandler { @Inject(type = ModelService.class, value = "logview") private ModelService m_service; + @Inject + private MessagePathBuilder m_pathBuilder; + private String getLogView(String messageId, boolean waterfall) { try { if (messageId != null) { @@ -88,8 +93,23 @@ public class Handler implements PageHandler { case MOBILE: model.setMobileResponse(logView); break; + case DETAIL: + String path = getPath(messageId); + model.setLogviewPath(path); + break; } m_jspViewer.view(ctx, model); } + + private String getPath(String messageId) { + MessageId id = MessageId.parse(messageId); + final String path = m_pathBuilder.getPath(new Date(id.getTimestamp()), ""); + final StringBuilder sb = new StringBuilder(); + sb.append('/').append(path); + + final String key = id.getDomain() + '-' + id.getIpAddress(); + return path+key; + } + } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java index 49ad4f3d0..ae323bdd0 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java @@ -5,7 +5,9 @@ public enum JspFile { LOGVIEW_NO_HEADER("/jsp/report/logview_no_header.jsp"), - MOBILE("/jsp/report/logview_mobile.jsp"); + MOBILE("/jsp/report/logview_mobile.jsp"), + + DETAIL("/jsp/report/logview_detail.jsp"); private String m_path; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspViewer.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspViewer.java index d732e9a5b..8c8d7d95f 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspViewer.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspViewer.java @@ -18,6 +18,8 @@ public class JspViewer extends BaseJspViewer } case MOBILE: return JspFile.MOBILE.getPath(); + case DETAIL: + return JspFile.DETAIL.getPath(); } throw new RuntimeException("Unknown action: " + action); diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Model.java index a8620f333..a2517556d 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Model.java @@ -11,6 +11,8 @@ public class Model extends AbstractReportModel { private String m_mobileResponse; private String m_table; + + private String m_logviewPath; public Model(Context ctx) { super(ctx); @@ -50,4 +52,13 @@ public class Model extends AbstractReportModel { public void setTable(String table) { m_table = table; } + + public String getLogviewPath() { + return m_logviewPath; + } + + public void setLogviewPath(String logviewPath) { + m_logviewPath = logviewPath; + } + } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/task/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/task/Handler.java index 9d1d7b0e2..24e054d72 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/task/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/task/Handler.java @@ -2,7 +2,6 @@ package com.dianping.cat.report.page.task; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; @@ -12,6 +11,7 @@ import com.dainping.cat.consumer.dal.report.Task; import com.dainping.cat.consumer.dal.report.TaskDao; import com.dainping.cat.consumer.dal.report.TaskEntity; import com.dianping.cat.Cat; +import com.dianping.cat.helper.CatString; import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.task.spi.ReportFacade; import com.site.dal.jdbc.DalException; @@ -23,8 +23,6 @@ import com.site.web.mvc.annotation.PayloadMeta; public class Handler implements PageHandler { - private static final String ALL = "All"; - private static final int PAGE_SIZE = 1000000; @Inject @@ -42,8 +40,8 @@ public class Handler implements PageHandler { int type = payload.getType(); int status = payload.getStatus(); - List domains = new ArrayList(Arrays.asList(ALL)); - List names = new ArrayList(Arrays.asList(ALL)); + List domains = new ArrayList(); + List names = new ArrayList(); List tasks = new ArrayList(); try { List domainSet = m_taskDao.findAllDistinct(start, end, TaskEntity.READSET_REPORT_DOMAIN); @@ -117,15 +115,15 @@ public class Handler implements PageHandler { model.setType(payload.getType()); model.setStatus(payload.getStatus()); - if (isEmpty(domain) || ALL.equals(domain)) { - model.setDomain(ALL); - queryDomain = null; + if (isEmpty(domain)) { + model.setDomain("Cat"); + queryDomain = "Cat"; } else { model.setDomain(domain); } - if (isEmpty(name) || ALL.equals(name)) { - model.setName(ALL); + if (isEmpty(name) || CatString.ALL_NAME.equals(name)) { + model.setName(CatString.ALL_NAME); queryName = null; } else { model.setName(name); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/DefaultTaskConsumer.java b/cat-home/src/main/java/com/dianping/cat/report/task/DefaultTaskConsumer.java index c2e978ea5..6038f1702 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/DefaultTaskConsumer.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/DefaultTaskConsumer.java @@ -52,8 +52,7 @@ public class DefaultTaskConsumer extends TaskConsumer { @Override protected void taskNotFoundDuration() { - Date awakeTime = TaskHelper.nextTaskTime(); - LockSupport.parkUntil(awakeTime.getTime()); + LockSupport.parkNanos(5 * 60 * 1000 * 1000 * 1000);// sleep 5 min } @Override @@ -102,12 +101,12 @@ public class DefaultTaskConsumer extends TaskConsumer { } @Override - public String getName() { - return "Task-Consumer"; - } + public String getName() { + return "Task-Consumer"; + } @Override - public void shutdown() { - - } + public void shutdown() { + + } } diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index 313895288..2e55704f1 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -1450,6 +1450,9 @@ logview m_service + + com.dianping.cat.message.spi.MessagePathBuilder + diff --git a/cat-home/src/main/webapp/jsp/report/logview_detail.jsp b/cat-home/src/main/webapp/jsp/report/logview_detail.jsp new file mode 100755 index 000000000..a7fd26da6 --- /dev/null +++ b/cat-home/src/main/webapp/jsp/report/logview_detail.jsp @@ -0,0 +1,20 @@ +<%@ page session="false" language="java" pageEncoding="UTF-8" %> +<%@ page contentType="text/html; charset=utf-8" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="a" uri="/WEB-INF/app.tld"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%> + + + + + + + + + + + +
+${model.logviewPath} + + \ No newline at end of file diff --git a/dog-home/pom.xml b/dog-home/pom.xml index e45f2f3f5..3a863cabe 100644 --- a/dog-home/pom.xml +++ b/dog-home/pom.xml @@ -1,10 +1,10 @@ - - com.dianping.cat - parent - 0.4.2 - + + com.dianping.cat + parent + 0.4.2 + 4.0.0 dog-home Dog Home @@ -14,10 +14,10 @@ com.dianping.cat dog-gateway - - com.dianping.cat - cat-consumer - + + com.dianping.cat + cat-consumer + com.site.common web-framework @@ -63,19 +63,23 @@ 6.1.14 test - - velocity - velocity-dep - 1.4 - + + velocity + velocity-dep + 1.4 + mysql mysql-connector-java 5.1.20 runtime + + com.site.dal + dal-jdbc + 1.1.7 + - @@ -112,7 +116,7 @@ dal-jdbc - + diff --git a/dog-home/src/main/java/com/dianping/dog/build/CatDatabaseConfigurator.java b/dog-home/src/main/java/com/dianping/dog/build/CatDatabaseConfigurator.java index 9764277be..55f4b1b1c 100644 --- a/dog-home/src/main/java/com/dianping/dog/build/CatDatabaseConfigurator.java +++ b/dog-home/src/main/java/com/dianping/dog/build/CatDatabaseConfigurator.java @@ -11,10 +11,11 @@ final class CatDatabaseConfigurator extends AbstractJdbcResourceConfigurator { public List defineComponents() { List all = new ArrayList(); + all.add(defineJdbcDataSourceConfigurationManagerComponent("datasources.xml")); all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "")); - defineSimpleTableProviderComponents(all, "cat", com.dainping.cat.consumer.dal.report._INDEX.getEntityClasses()); - defineDaoComponents(all, com.dainping.cat.consumer.dal.report._INDEX.getDaoClasses()); + defineSimpleTableProviderComponents(all, "cat", com.dianping.dog.dal._INDEX.getEntityClasses()); + defineDaoComponents(all, com.dianping.dog.dal._INDEX.getDaoClasses()); return all; } diff --git a/dog-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml b/dog-home/src/main/resources/META-INF/dal/jdbc/alarm-codegen.xml similarity index 95% rename from dog-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml rename to dog-home/src/main/resources/META-INF/dal/jdbc/alarm-codegen.xml index cc0c0a7f6..5f9f3c0af 100644 --- a/dog-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml +++ b/dog-home/src/main/resources/META-INF/dal/jdbc/alarm-codegen.xml @@ -1,174 +1,174 @@ - - - - - - - - - - - - - - - - - - - - - - - - FROM WHERE = ${key-id}]]> - - - () VALUES()]]> - - - - SET WHERE = ${key-id}]]> - - - - WHERE = ${key-id}]]> - - - - - - - - - - - - - - - - - - - - - - - - FROM
WHERE = ${key-id}]]> - - - () VALUES()]]> - - - - SET WHERE = ${key-id}]]> - - - - WHERE = ${key-id}]]> - - - - - - - - - - - - - - - - - - - - - - FROM
WHERE = ${key-id}]]> - - - () VALUES()]]> - - - - SET WHERE = ${key-id}]]> - - - - WHERE = ${key-id}]]> - - - - - - - - - - - - - - - - - - - - - - FROM
WHERE = ${key-id}]]> - - - () VALUES()]]> - - - - SET WHERE = ${key-id}]]> - - - - WHERE = ${key-id}]]> - - - - - - - - - - - - - - - - - - - - - - FROM
WHERE = ${key-id}]]> - - - () VALUES()]]> - - - - SET WHERE = ${key-id}]]> - - - - WHERE = ${key-id}]]> - - - - - + + + + + + + + + + + + + + + + + + + + + FROM
WHERE = ${key-id}]]> + + + () VALUES()]]> + + + + SET WHERE = ${key-id}]]> + + + + WHERE = ${key-id}]]> + + + + + + + + + + + + + + + + + + + + + + FROM
WHERE = ${key-id}]]> + + + () VALUES()]]> + + + + SET WHERE = ${key-id}]]> + + + + WHERE = ${key-id}]]> + + + + + + + + + + + + + + + + + + + + + + FROM
WHERE = ${key-id}]]> + + + () VALUES()]]> + + + + SET WHERE = ${key-id}]]> + + + + WHERE = ${key-id}]]> + + + + + + + + + + + + + + + + + + + + + + + + + FROM
WHERE = ${key-id}]]> + + + () VALUES()]]> + + + + SET WHERE = ${key-id}]]> + + + + WHERE = ${key-id}]]> + + + + + + + + + + + + + + + + + + + + + + + + FROM
WHERE = ${key-id}]]> + + + () VALUES()]]> + + + + SET WHERE = ${key-id}]]> + + + + WHERE = ${key-id}]]> + + + + + diff --git a/dog-home/src/main/resources/META-INF/dal/jdbc/report-dal.xml b/dog-home/src/main/resources/META-INF/dal/jdbc/alarm-dal.xml similarity index 100% rename from dog-home/src/main/resources/META-INF/dal/jdbc/report-dal.xml rename to dog-home/src/main/resources/META-INF/dal/jdbc/alarm-dal.xml diff --git a/dog-home/src/main/resources/META-INF/dal/jdbc/alarm-manifest.xml b/dog-home/src/main/resources/META-INF/dal/jdbc/alarm-manifest.xml new file mode 100644 index 000000000..ca524ebe7 --- /dev/null +++ b/dog-home/src/main/resources/META-INF/dal/jdbc/alarm-manifest.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/dog-home/src/main/resources/META-INF/dal/jdbc/report-manifest.xml b/dog-home/src/main/resources/META-INF/dal/jdbc/report-manifest.xml deleted file mode 100644 index bd683caa9..000000000 --- a/dog-home/src/main/resources/META-INF/dal/jdbc/report-manifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/dog-home/src/main/resources/META-INF/plexus/components.xml b/dog-home/src/main/resources/META-INF/plexus/components.xml index 0f2ef93ec..02491c154 100644 --- a/dog-home/src/main/resources/META-INF/plexus/components.xml +++ b/dog-home/src/main/resources/META-INF/plexus/components.xml @@ -173,6 +173,13 @@ + + com.site.dal.jdbc.datasource.JdbcDataSourceConfigurationManager + com.site.dal.jdbc.datasource.JdbcDataSourceConfigurationManager + + datasources.xml + + com.site.dal.jdbc.datasource.DataSource cat @@ -199,57 +206,57 @@ com.site.dal.jdbc.mapping.TableProvider - report + ruleinstance com.site.dal.jdbc.mapping.SimpleTableProvider - report + ruleinstance cat com.site.dal.jdbc.mapping.TableProvider - hostinfo + ruletemplate com.site.dal.jdbc.mapping.SimpleTableProvider - hostinfo + ruletemplate cat com.site.dal.jdbc.mapping.TableProvider - sqltable + subscriber com.site.dal.jdbc.mapping.SimpleTableProvider - sqltable + subscriber cat com.site.dal.jdbc.mapping.TableProvider - task + dailyreport com.site.dal.jdbc.mapping.SimpleTableProvider - task + dailyreport cat com.site.dal.jdbc.mapping.TableProvider - logview + maillog com.site.dal.jdbc.mapping.SimpleTableProvider - logview + maillog cat - com.dainping.cat.consumer.dal.report.ReportDao - com.dainping.cat.consumer.dal.report.ReportDao + com.dianping.dog.dal.RuleinstanceDao + com.dianping.dog.dal.RuleinstanceDao com.site.dal.jdbc.QueryEngine @@ -257,8 +264,8 @@ - com.dainping.cat.consumer.dal.report.HostinfoDao - com.dainping.cat.consumer.dal.report.HostinfoDao + com.dianping.dog.dal.RuletemplateDao + com.dianping.dog.dal.RuletemplateDao com.site.dal.jdbc.QueryEngine @@ -266,8 +273,8 @@ - com.dainping.cat.consumer.dal.report.SqltableDao - com.dainping.cat.consumer.dal.report.SqltableDao + com.dianping.dog.dal.SubscriberDao + com.dianping.dog.dal.SubscriberDao com.site.dal.jdbc.QueryEngine @@ -275,8 +282,8 @@ - com.dainping.cat.consumer.dal.report.TaskDao - com.dainping.cat.consumer.dal.report.TaskDao + com.dianping.dog.dal.DailyreportDao + com.dianping.dog.dal.DailyreportDao com.site.dal.jdbc.QueryEngine @@ -284,8 +291,8 @@ - com.dainping.cat.consumer.dal.report.LogviewDao - com.dainping.cat.consumer.dal.report.LogviewDao + com.dianping.dog.dal.MaillogDao + com.dianping.dog.dal.MaillogDao com.site.dal.jdbc.QueryEngine diff --git a/dog-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml b/dog-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml index 3d929f41c..6a3d0cf68 100644 --- a/dog-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml +++ b/dog-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml @@ -1,18 +1,18 @@ - - - - com.mysql.jdbc.Driver - jdbc:mysql://192.168.7.43:3306/cat - dpcom_cat - password - useUnicode=true&autoReconnect=true - - -
-
-
-
-
- - - + + + + com.mysql.jdbc.Driver + jdbc:mysql://192.168.7.43:3306/cat + dpcom_cat + password + useUnicode=true&autoReconnect=true + + +
+
+
+
+
+ + + diff --git a/dog-home/src/test/java/com/dianping/cat/consumer/AllTests.java b/dog-home/src/test/java/com/dianping/cat/consumer/AllTests.java new file mode 100644 index 000000000..8283d84cb --- /dev/null +++ b/dog-home/src/test/java/com/dianping/cat/consumer/AllTests.java @@ -0,0 +1,15 @@ +package com.dianping.cat.consumer; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +@RunWith(Suite.class) +@SuiteClasses({ + +// add test classes here + +}) +public class AllTests { + +} -- GitLab