You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/14 09:32:15 UTC
[1/2] logging-log4j2 git commit: Checkstyle.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3ecee80ae -> 514865fef
Checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d4e0175f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d4e0175f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d4e0175f
Branch: refs/heads/master
Commit: d4e0175f1d64801b06e0ce0e62e2cb8a336b3103
Parents: 3ecee80
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 14 00:31:13 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 14 00:31:13 2015 -0700
----------------------------------------------------------------------
.../appender/mom/jeromq/JeroMqAppender.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d4e0175f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
index a37c169..704907b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
@@ -56,6 +56,14 @@ public final class JeroMqAppender extends AbstractAppender {
// Per ZMQ docs, there should usually only be one ZMQ context per process.
private static volatile ZMQ.Context context;
+ private static final int DEFAULT_BACKLOG = 100;
+
+ private static final int DEFAULT_IVL = 100;
+
+ private static final int DEFAULT_RCV_HWM = 1000;
+
+ private static final int DEFAULT_SND_HWM = 1000;
+
private static Logger logger;
// ZMQ sockets are not thread safe.
@@ -104,25 +112,25 @@ public final class JeroMqAppender extends AbstractAppender {
@PluginAttribute("ignoreExceptions") final boolean ignoreExceptions,
// ZMQ attributes; defaults picked from zmq.Options.
@PluginAttribute(value = "affinity", defaultLong = 0) final long affinity,
- @PluginAttribute(value = "backlog", defaultLong = 100) final long backlog,
- @PluginAttribute(value = "delayAttachOnConnect", defaultBoolean=false) final boolean delayAttachOnConnect,
+ @PluginAttribute(value = "backlog", defaultLong = DEFAULT_BACKLOG) final long backlog,
+ @PluginAttribute(value = "delayAttachOnConnect", defaultBoolean = false) final boolean delayAttachOnConnect,
@PluginAttribute(value = "identity") final byte[] identity,
@PluginAttribute(value = "ipv4Only", defaultBoolean = true) final boolean ipv4Only,
@PluginAttribute(value = "linger", defaultLong = -1) final long linger,
@PluginAttribute(value = "maxMsgSize", defaultLong = -1) final long maxMsgSize,
- @PluginAttribute(value = "rcvHwm", defaultLong = 1000) final long rcvHwm,
+ @PluginAttribute(value = "rcvHwm", defaultLong = DEFAULT_RCV_HWM) final long rcvHwm,
@PluginAttribute(value = "receiveBufferSize", defaultLong = 0) final long receiveBufferSize,
@PluginAttribute(value = "receiveTimeOut", defaultLong = -1) final int receiveTimeOut,
- @PluginAttribute(value = "reconnectIVL", defaultLong = 100) final long reconnectIVL,
+ @PluginAttribute(value = "reconnectIVL", defaultLong = DEFAULT_IVL) final long reconnectIVL,
@PluginAttribute(value = "reconnectIVLMax", defaultLong = 0) final long reconnectIVLMax,
@PluginAttribute(value = "sendBufferSize", defaultLong = 0) final long sendBufferSize,
@PluginAttribute(value = "sendTimeOut", defaultLong = -1) final int sendTimeOut,
- @PluginAttribute(value = "sndHwm", defaultLong = 1000) final long sndHwm,
+ @PluginAttribute(value = "sndHwm", defaultLong = DEFAULT_SND_HWM) final long sndHwm,
@PluginAttribute(value = "tcpKeepAlive", defaultInt = -1) final int tcpKeepAlive,
@PluginAttribute(value = "tcpKeepAliveCount", defaultLong = -1) final long tcpKeepAliveCount,
@PluginAttribute(value = "tcpKeepAliveIdle", defaultLong = -1) final long tcpKeepAliveIdle,
@PluginAttribute(value = "tcpKeepAliveInterval", defaultLong = -1) final long tcpKeepAliveInterval,
- @PluginAttribute(value = "xpubVerbose", defaultBoolean = false) final boolean xpubVerbose
+ @PluginAttribute(value = "xpubVerbose", defaultBoolean = false) final boolean xpubVerbose
// @formatter:on
) {
if (layout == null) {
[2/2] logging-log4j2 git commit: Checkstyle: Add HiddenField section
as discussed on dev ML.
Posted by gg...@apache.org.
Checkstyle: Add HiddenField section as discussed on dev ML.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/514865fe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/514865fe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/514865fe
Branch: refs/heads/master
Commit: 514865fef8cf9704a995e89860a78ebcd40754f4
Parents: d4e0175
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 14 00:32:13 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 14 00:32:13 2015 -0700
----------------------------------------------------------------------
checkstyle.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/514865fe/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index bfcfe15..9bcb9b1 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.1//EN"
"http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
@@ -228,7 +227,6 @@
</module>
-
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="ArrayTypeStyle"/>
@@ -237,6 +235,11 @@
</module>
<module name="UpperEll"/>
+ <module name="HiddenField">
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="ignoreSetter" value="true"/>
+ </module>
+
</module>
</module>