From e75dab5cc87d103f9b21743bf7a4901f08060a70 Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Mon, 4 Jan 2016 17:06:52 +0800 Subject: [PATCH] --- src/org/redkale/boot/Application.java | 20 +++++++++++--------- src/org/redkale/boot/LogFileHandler.java | 12 ++++++++++-- src/org/redkale/boot/NodeProtocol.java | 6 +++++- src/org/redkale/boot/NodeServer.java | 10 +++++++++- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java index 8acdf9d32..608698ebd 100644 --- a/src/org/redkale/boot/Application.java +++ b/src/org/redkale/boot/Application.java @@ -37,7 +37,9 @@ import org.w3c.dom.*; * 最后进行Service、Servlet与其他资源之间的依赖注入。 * * - *

详情见: http://www.redkale.org + *

+ * 详情见: http://www.redkale.org + * * @author zhangjx */ public final class Application { @@ -69,21 +71,21 @@ public final class Application { //当前Service所属的组 类型: Set、String[] public static final String RESNAME_SNCP_GROUPS = Sncp.RESNAME_SNCP_GROUPS; // SNCP_GROUPS - protected final Map globalNodes = new HashMap<>(); + final Map globalNodes = new HashMap<>(); - private final Map> globalGroups = new HashMap<>(); + final Map> globalGroups = new HashMap<>(); - protected final List transports = new ArrayList<>(); + final List transports = new ArrayList<>(); - protected final InetAddress localAddress; + final InetAddress localAddress; - protected final List cacheSources = new CopyOnWriteArrayList<>(); + final List cacheSources = new CopyOnWriteArrayList<>(); - protected final List dataSources = new CopyOnWriteArrayList<>(); + final List dataSources = new CopyOnWriteArrayList<>(); - protected final List servers = new CopyOnWriteArrayList<>(); + final List servers = new CopyOnWriteArrayList<>(); - protected CountDownLatch servicecdl; //会出现两次赋值 + CountDownLatch servicecdl; //会出现两次赋值 //-------------------------------------------------------------------------------------------- private final ResourceFactory factory = ResourceFactory.root(); diff --git a/src/org/redkale/boot/LogFileHandler.java b/src/org/redkale/boot/LogFileHandler.java index db567f2c8..0039890d0 100644 --- a/src/org/redkale/boot/LogFileHandler.java +++ b/src/org/redkale/boot/LogFileHandler.java @@ -16,13 +16,17 @@ import java.util.logging.*; import java.util.logging.Formatter; /** - * 自定义的日志存储类 + * 自定义的日志输出类 *

- *

详情见: http://www.redkale.org + * 详情见: http://www.redkale.org + * * @author zhangjx */ public class LogFileHandler extends Handler { + /** + * SNCP的日志输出Handler + */ public static class SncpLogFileHandler extends LogFileHandler { @Override @@ -31,6 +35,10 @@ public class LogFileHandler extends Handler { } } + /** + * 默认的日志时间格式化类 + * + */ public static class LoggingFormater extends Formatter { private static final String format = "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%tL %4$s %2$s\r\n%5$s%6$s\r\n"; diff --git a/src/org/redkale/boot/NodeProtocol.java b/src/org/redkale/boot/NodeProtocol.java index 5ce00b6e5..76c03dff9 100644 --- a/src/org/redkale/boot/NodeProtocol.java +++ b/src/org/redkale/boot/NodeProtocol.java @@ -8,13 +8,17 @@ package org.redkale.boot; import java.lang.annotation.*; /** + * 根据application.xml中的server节点中的protocol值来适配Server的加载逻辑 + * + *

+ * 详情见: http://www.redkale.org * - *

详情见: http://www.redkale.org * @author zhangjx */ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface NodeProtocol { + String[] value(); } diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java index 841d8555a..01c3f23e8 100644 --- a/src/org/redkale/boot/NodeServer.java +++ b/src/org/redkale/boot/NodeServer.java @@ -30,21 +30,29 @@ import org.redkale.util.*; /** * - *

详情见: http://www.redkale.org + *

+ * 详情见: http://www.redkale.org + * * @author zhangjx */ public abstract class NodeServer { + //INFO日志的换行符 public static final String LINE_SEPARATOR = "\r\n"; + //日志输出对象 protected final Logger logger; + //日志是否为FINE级别 protected final boolean fine; + //进程主类 protected final Application application; + //依赖注入工厂类 protected final ResourceFactory factory; + //当前Server对象 protected final Server server; private String sncpGroup = null; //当前Server的SNCP协议的组