Repository: logging-log4j2 Updated Branches: refs/heads/master a73ae666b -> b46ee7434
Add "Millis" post fix to ivars and pnames. Also rename plugin attributes and add an no Millis postfix for backward compatibility. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b46ee743 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b46ee743 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b46ee743 Branch: refs/heads/master Commit: b46ee74349f796bb0297dbc0527de9a7c6d6e0d0 Parents: a73ae66 Author: Gary Gregory <[email protected]> Authored: Fri Oct 3 18:53:04 2014 -0400 Committer: Gary Gregory <[email protected]> Committed: Fri Oct 3 18:53:04 2014 -0400 ---------------------------------------------------------------------- .../log4j/flume/appender/FlumeAppender.java | 20 ++++---- .../log4j/flume/appender/FlumeAvroManager.java | 51 ++++++++++---------- src/site/xdoc/manual/appenders.xml | 4 +- 3 files changed, 38 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b46ee743/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java index 91ea833..c37ea1d 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java @@ -139,9 +139,9 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF * <b>Note: </b><i>The embedded attribute is deprecated in favor of specifying the type attribute.</i> * @param type Avro (default), Embedded, or Persistent. * @param dataDir The directory where the Flume FileChannel should write its data. - * @param connectionTimeout The amount of time in milliseconds to wait before a connection times out. Minimum is + * @param connectionTimeoutMillis The amount of time in milliseconds to wait before a connection times out. Minimum is * 1000. - * @param requestTimeout The amount of time in milliseconds to wait before a request times out. Minimum is 1000. + * @param requestTimeoutMillis The amount of time in milliseconds to wait before a request times out. Minimum is 1000. * @param agentRetries The number of times to retry an agent before failing to the next agent. * @param maxDelayMillis The maximum number of milliseconds to wait for a complete batch. * @param name The name of the Appender. @@ -167,8 +167,10 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF @PluginAttribute("embedded") final String embedded, @PluginAttribute("type") final String type, @PluginAttribute("dataDir") final String dataDir, - @PluginAttribute("connectTimeout") final String connectionTimeout, - @PluginAttribute("requestTimeout") final String requestTimeout, + @PluginAliases("connectTimeout") + @PluginAttribute("connectTimeoutMillis") final String connectionTimeoutMillis, + @PluginAliases("requestTimeout") + @PluginAttribute("requestTimeoutMillis") final String requestTimeoutMillis, @PluginAttribute("agentRetries") final String agentRetries, @PluginAliases("maxDelay") // deprecated @PluginAttribute("maxDelayMillis") final String maxDelayMillis, @@ -216,8 +218,8 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF } final int batchCount = Integers.parseInt(batchSize, 1); - final int connectTimeout = Integers.parseInt(connectionTimeout, 0); - final int reqTimeout = Integers.parseInt(requestTimeout, 0); + final int connectTimeoutMillis = Integers.parseInt(connectionTimeoutMillis, 0); + final int reqTimeoutMillis = Integers.parseInt(requestTimeoutMillis, 0); final int retries = Integers.parseInt(agentRetries, 0); final int lockTimeoutRetryCount = Integers.parseInt(lockTimeoutRetries, DEFAULT_LOCK_TIMEOUT_RETRY_COUNT); final int delayMillis = Integers.parseInt(maxDelayMillis, DEFAULT_MAX_DELAY); @@ -245,7 +247,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF LOGGER.debug("No agents provided, using defaults"); agents = new Agent[] {Agent.createAgent(null, null)}; } - manager = FlumeAvroManager.getManager(name, agents, batchCount, retries, connectTimeout, reqTimeout); + manager = FlumeAvroManager.getManager(name, agents, batchCount, retries, connectTimeoutMillis, reqTimeoutMillis); break; case PERSISTENT: if (agents == null || agents.length == 0) { @@ -253,7 +255,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF agents = new Agent[] {Agent.createAgent(null, null)}; } manager = FlumePersistentManager.getManager(name, agents, properties, batchCount, retries, - connectTimeout, reqTimeout, delayMillis, lockTimeoutRetryCount, dataDir); + connectTimeoutMillis, reqTimeoutMillis, delayMillis, lockTimeoutRetryCount, dataDir); break; default: LOGGER.debug("No manager type specified. Defaulting to AVRO"); @@ -261,7 +263,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF LOGGER.debug("No agents provided, using defaults"); agents = new Agent[] {Agent.createAgent(null, null)}; } - manager = FlumeAvroManager.getManager(name, agents, batchCount, retries, connectTimeout, reqTimeout); + manager = FlumeAvroManager.getManager(name, agents, batchCount, retries, connectTimeoutMillis, reqTimeoutMillis); } if (manager == null) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b46ee743/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java index 57f673b..a4d52b6 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java @@ -40,9 +40,9 @@ public class FlumeAvroManager extends AbstractFlumeManager { private final int retries; - private final int connectTimeout; + private final int connectTimeoutMillis; - private final int requestTimeout; + private final int requestTimeoutMillis; private final int current = 0; @@ -64,8 +64,8 @@ public class FlumeAvroManager extends AbstractFlumeManager { this.agents = agents; this.batchSize = batchSize; this.retries = retries; - this.connectTimeout = connectTimeout; - this.requestTimeout = requestTimeout; + this.connectTimeoutMillis = connectTimeout; + this.requestTimeoutMillis = requestTimeout; this.rpcClient = connect(agents, retries, connectTimeout, requestTimeout); } @@ -75,12 +75,12 @@ public class FlumeAvroManager extends AbstractFlumeManager { * @param agents The agents to use. * @param batchSize The number of events to include in a batch. * @param retries The number of times to retry connecting before giving up. - * @param connectTimeout The connection timeout in ms. - * @param requestTimeout The request timeout in ms. + * @param connectTimeoutMillis The connection timeout in ms. + * @param requestTimeoutMillis The request timeout in ms. * @return A FlumeAvroManager. */ public static FlumeAvroManager getManager(final String name, final Agent[] agents, int batchSize, - final int retries, final int connectTimeout, final int requestTimeout) { + final int retries, final int connectTimeoutMillis, final int requestTimeoutMillis) { if (agents == null || agents.length == 0) { throw new IllegalArgumentException("At least one agent is required"); } @@ -100,7 +100,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { } sb.append(']'); return getManager(sb.toString(), factory, - new FactoryData(name, agents, batchSize, retries, connectTimeout, requestTimeout)); + new FactoryData(name, agents, batchSize, retries, connectTimeoutMillis, requestTimeoutMillis)); } /** @@ -123,12 +123,12 @@ public class FlumeAvroManager extends AbstractFlumeManager { return retries; } - public int getConnectTimeout() { - return connectTimeout; + public int getConnectTimeoutMillis() { + return connectTimeoutMillis; } - public int getRequestTimeout() { - return requestTimeout; + public int getRequestTimeoutMillis() { + return requestTimeoutMillis; } public int getBatchSize() { @@ -137,7 +137,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { public synchronized void send(final BatchEvent events) { if (rpcClient == null) { - rpcClient = connect(agents, retries, connectTimeout, requestTimeout); + rpcClient = connect(agents, retries, connectTimeoutMillis, requestTimeoutMillis); } if (rpcClient != null) { @@ -163,7 +163,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { @Override public synchronized void send(final Event event) { if (rpcClient == null) { - rpcClient = connect(agents, retries, connectTimeout, requestTimeout); + rpcClient = connect(agents, retries, connectTimeoutMillis, requestTimeoutMillis); } if (rpcClient != null) { @@ -190,8 +190,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { * @param agents The list of agents to choose from * @return The FlumeEventAvroServer. */ - - private RpcClient connect(final Agent[] agents, int retries, final int connectTimeout, final int requestTimeout) { + private RpcClient connect(final Agent[] agents, int retries, final int connectTimeoutMillis, final int requestTimeoutMillis) { try { final Properties props = new Properties(); @@ -217,11 +216,11 @@ public class FlumeAvroManager extends AbstractFlumeManager { } props.put("max-attempts", Integer.toString(retries * agents.length)); } - if (requestTimeout >= MINIMUM_TIMEOUT) { - props.put("request-timeout", Integer.toString(requestTimeout)); + if (requestTimeoutMillis >= MINIMUM_TIMEOUT) { + props.put("request-timeout", Integer.toString(requestTimeoutMillis)); } - if (connectTimeout >= MINIMUM_TIMEOUT) { - props.put("connect-timeout", Integer.toString(connectTimeout)); + if (connectTimeoutMillis >= MINIMUM_TIMEOUT) { + props.put("connect-timeout", Integer.toString(connectTimeoutMillis)); } return RpcClientFactory.getInstance(props); } catch (final Exception ex) { @@ -250,8 +249,8 @@ public class FlumeAvroManager extends AbstractFlumeManager { private final Agent[] agents; private final int batchSize; private final int retries; - private final int conntectTimeout; - private final int requestTimeout; + private final int conntectTimeoutMillis; + private final int requestTimeoutMillis; /** * Constructor. @@ -260,13 +259,13 @@ public class FlumeAvroManager extends AbstractFlumeManager { * @param batchSize The number of events to include in a batch. */ public FactoryData(final String name, final Agent[] agents, final int batchSize, final int retries, - final int connectTimeout, final int requestTimeout) { + final int connectTimeoutMillis, final int requestTimeoutMillis) { this.name = name; this.agents = agents; this.batchSize = batchSize; this.retries = retries; - this.conntectTimeout = connectTimeout; - this.requestTimeout = requestTimeout; + this.conntectTimeoutMillis = connectTimeoutMillis; + this.requestTimeoutMillis = requestTimeoutMillis; } } @@ -286,7 +285,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { try { return new FlumeAvroManager(name, data.name, data.agents, data.batchSize, data.retries, - data.conntectTimeout, data.requestTimeout); + data.conntectTimeoutMillis, data.requestTimeoutMillis); } catch (final Exception ex) { LOGGER.error("Could not create FlumeAvroManager", ex); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b46ee743/src/site/xdoc/manual/appenders.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml index 3b57099..c10e7ef 100644 --- a/src/site/xdoc/manual/appenders.xml +++ b/src/site/xdoc/manual/appenders.xml @@ -451,7 +451,7 @@ <td>When set to true the message body will be compressed using gzip</td> </tr> <tr> - <td>connectTimeout</td> + <td>connectTimeoutMillis</td> <td>integer</td> <td>The number of milliseconds Flume will wait before timing out the connection.</td> </tr> @@ -540,7 +540,7 @@ </td> </tr> <tr> - <td>requestTimeout</td> + <td>requestTimeoutMillis</td> <td>integer</td> <td>The number of milliseconds Flume will wait before timing out the request.</td> </tr>
