Updated Branches: refs/heads/trunk 1675d49a2 -> 9fba39cb9
FLUME-1808. ElasticSearchSink is missing log4.properties. (Brock Noland via Mike Percy) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/9fba39cb Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/9fba39cb Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/9fba39cb Branch: refs/heads/trunk Commit: 9fba39cb9710b1cf87039acab9a84b29028d97ee Parents: 1675d49 Author: Mike Percy <[email protected]> Authored: Thu Dec 20 15:40:26 2012 -0800 Committer: Mike Percy <[email protected]> Committed: Thu Dec 20 15:40:26 2012 -0800 ---------------------------------------------------------------------- .../sink/elasticsearch/TestElasticSearchSink.java | 3 +- .../src/test/resources/log4j.properties | 25 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/9fba39cb/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchSink.java ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchSink.java b/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchSink.java index 4faa5be..94b95b1 100644 --- a/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchSink.java +++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchSink.java @@ -39,6 +39,7 @@ import org.apache.flume.Transaction; import org.apache.flume.conf.Configurables; import org.apache.flume.event.EventBuilder; import org.elasticsearch.client.Requests; +import org.elasticsearch.common.UUID; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.junit.After; import org.junit.Before; @@ -53,6 +54,7 @@ public class TestElasticSearchSink extends AbstractElasticSearchSinkTest { initDefaults(); createNodes(); fixture = new ElasticSearchSink(true); + fixture.setName("ElasticSearchSink-" + UUID.randomUUID().toString()); } @After @@ -110,7 +112,6 @@ public class TestElasticSearchSink extends AbstractElasticSearchSinkTest { assertMatchAllQuery(numberOfEvents, events); assertBodyQuery(5, events); } - @Test public void shouldIndexFiveEventsOverThreeBatches() throws Exception { parameters.put(BATCH_SIZE, "2"); http://git-wip-us.apache.org/repos/asf/flume/blob/9fba39cb/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/resources/log4j.properties b/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/resources/log4j.properties new file mode 100644 index 0000000..9036aca --- /dev/null +++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/resources/log4j.properties @@ -0,0 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + +log4j.rootLogger = DEBUG, out + +log4j.appender.out = org.apache.log4j.ConsoleAppender +log4j.appender.out.layout = org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n + +log4j.logger.org.apache.flume = DEBUG
