forked from apache/geode
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GEODE-6122: Make log4j core optional (apache#2944)
* Add Logging ProviderAgent support for ServiceLoader * Test for availability of Log4j Core before defaulting to Log4jAgent * Change optional ProviderAgent methods to have default impls * Extract LogLevelUpdateOccurs enum to top level class * Extract LogLevelUpdateScope enum to top level class * Move Banner to internal.logging package * Break Banner's hard dependency on Log4J Core * Improve javadocs * Add field type to TestingOnly annotation * Replace use of InternalLogWriter constants with LogWriterLevel enum
- Loading branch information
Showing
37 changed files
with
683 additions
and
330 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...tegrationTest/java/org/apache/geode/internal/logging/FileSystemCanaryIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| package org.apache.geode.internal.logging; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.charset.Charset; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
|
|
||
| import org.apache.commons.io.FileUtils; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
| import org.junit.rules.TemporaryFolder; | ||
| import org.junit.rules.TestName; | ||
|
|
||
| import org.apache.geode.test.junit.categories.LoggingTest; | ||
|
|
||
| /** | ||
| * Integration tests to confirm that writing to file system works properly in stressTest | ||
| */ | ||
| @Category(LoggingTest.class) | ||
| public class FileSystemCanaryIntegrationTest { | ||
|
|
||
| private File file; | ||
| private Collection<String> lines; | ||
|
|
||
| @Rule | ||
| public TemporaryFolder temporaryFolder = new TemporaryFolder(); | ||
|
|
||
| @Rule | ||
| public TestName testName = new TestName(); | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| String name = testName.getMethodName(); | ||
| file = new File(temporaryFolder.getRoot(), name + "-main.log"); | ||
|
|
||
| lines = new ArrayList<>(); | ||
| for (int i = 1; i <= 10; i++) { | ||
| lines.add("Line-" + i); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void readLinesReturnsSameLinesThatWereJustWritten() throws IOException { | ||
| FileUtils.writeLines(file, lines); | ||
|
|
||
| assertThat(FileUtils.readLines(file, Charset.defaultCharset())).isEqualTo(lines); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.