Author: amitj
Date: Fri Jul 27 07:28:58 2018
New Revision: 1836785
URL: http://svn.apache.org/viewvc?rev=1836785&view=rev
Log:
OAK-7663: Make oak-run LoggingInitializer generic
- Add option to not reset the configuration, would be useful for testing
purposes
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java?rev=1836785&r1=1836784&r2=1836785&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
Fri Jul 27 07:28:58 2018
@@ -48,11 +48,20 @@ public class LoggingInitializer {
private final File workDir;
private final String config;
private final String logIdentifier;
+ private final boolean doReset;
public LoggingInitializer(File workDir, String logIdentifier) {
this.workDir = workDir;
this.logIdentifier = logIdentifier;
this.config = LOGBACK_XML_PREFIX + logIdentifier + ".xml";
+ this.doReset = true;
+ }
+
+ public LoggingInitializer(File workDir, String logIdentifier, boolean
reset) {
+ this.workDir = workDir;
+ this.logIdentifier = logIdentifier;
+ this.config = LOGBACK_XML_PREFIX + logIdentifier + ".xml";
+ this.doReset = reset;
}
public void init() throws IOException {
@@ -82,7 +91,9 @@ public class LoggingInitializer {
System.setProperty("oak.workDir",
FilenameUtils.normalizeNoEndSeparator(workDir.getAbsolutePath()));
// Call context.reset() to clear any previous configuration, e.g.
default
// configuration. For multi-step configuration, omit calling
context.reset().
- context.reset();
+ if (doReset) {
+ context.reset();
+ }
configurator.doConfigure(config);
} catch (JoranException je) {
// StatusPrinter will handle this
