Author: amitj
Date: Fri Jul 27 07:28:45 2018
New Revision: 1836784
URL: http://svn.apache.org/viewvc?rev=1836784&view=rev
Log:
OAK-7663: Make oak-run LoggingInitializer generic
- Now callers can specify a log identifier to identify the loggin configuration
Added:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
(contents, props changed)
- copied, changed from r1836783,
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LoggingInitializer.java
Removed:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LoggingInitializer.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/pom.xml
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
Modified: jackrabbit/oak/trunk/oak-run-commons/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/pom.xml?rev=1836784&r1=1836783&r2=1836784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run-commons/pom.xml Fri Jul 27 07:28:45 2018
@@ -32,6 +32,10 @@
<dependencies>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
<version>${project.version}</version>
Copied:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
(from r1836783,
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/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?p2=jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LoggingInitializer.java&r1=1836783&r2=1836784&rev=1836784&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/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:45 2018
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.index;
+package org.apache.jackrabbit.oak.run.commons;
import java.io.File;
import java.io.IOException;
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Configures the logging based on logback-indexing.xml. This file
+ * Configures the logging based on logback-{logIdentifier}.xml specified. This
file
* would be copied to work directory and then logging would be
* configured based on that
*
@@ -43,12 +43,16 @@ import org.slf4j.LoggerFactory;
* oak-run is in progress would be picked up
*/
public class LoggingInitializer {
- private static final String LOGBACK_INDEX_XML = "logback-indexing.xml";
+ private static final String LOGBACK_XML_PREFIX = "logback-";
private final Logger log = LoggerFactory.getLogger(getClass());
private final File workDir;
+ private final String config;
+ private final String logIdentifier;
- public LoggingInitializer(File workDir) {
+ public LoggingInitializer(File workDir, String logIdentifier) {
this.workDir = workDir;
+ this.logIdentifier = logIdentifier;
+ this.config = LOGBACK_XML_PREFIX + logIdentifier + ".xml";
}
public void init() throws IOException {
@@ -61,7 +65,7 @@ public class LoggingInitializer {
configureLogback(config);
log.info("Logging configured from {}", config.getAbsolutePath());
log.info("Any change in logging config would be picked up");
- log.info("Logs would be written to {}", new File(workDir,
"indexing.log"));
+ log.info("Logs would be written to {}", new File(workDir,
logIdentifier + ".log"));
}
public static void shutdownLogging(){
@@ -87,8 +91,8 @@ public class LoggingInitializer {
}
private File copyDefaultConfig() throws IOException {
- URL url = getClass().getResource("/" + LOGBACK_INDEX_XML);
- File dest = new File(workDir, LOGBACK_INDEX_XML);
+ URL url = getClass().getResource("/" + config);
+ File dest = new File(workDir, config);
try (InputStream is = url.openStream()) {
FileUtils.copyInputStreamToFile(is, dest);
}
Propchange:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/LoggingInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java?rev=1836784&r1=1836783&r2=1836784&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
Fri Jul 27 07:28:45 2018
@@ -49,6 +49,7 @@ import org.apache.jackrabbit.oak.run.cli
import org.apache.jackrabbit.oak.run.cli.NodeStoreFixtureProvider;
import org.apache.jackrabbit.oak.run.cli.Options;
import org.apache.jackrabbit.oak.run.commons.Command;
+import org.apache.jackrabbit.oak.run.commons.LoggingInitializer;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.util.ISO8601;
import org.slf4j.Logger;
@@ -60,6 +61,8 @@ import static java.util.Collections.empt
public class IndexCommand implements Command {
private static final Logger log =
LoggerFactory.getLogger(IndexCommand.class);
+ private static final String LOG_SUFFIX = "indexing";
+
public static final String NAME = "index";
public static final String INDEX_DEFINITIONS_JSON =
"index-definitions.json";
public static final String INDEX_INFO_TXT = "index-info.txt";
@@ -355,7 +358,7 @@ public class IndexCommand implements Com
}
private static void setupLogging(IndexOptions indexOpts) throws
IOException {
- new LoggingInitializer(indexOpts.getWorkDir()).init();
+ new LoggingInitializer(indexOpts.getWorkDir(), LOG_SUFFIX).init();
}
private void shutdownLogging() {
