Changeset 6082

Timestamp:

03/06/15 09:14:40 (9 years ago)

Author:

Twan Goosen

Message:

VLO distribution creates a 'log' directory. Importer start script sets a JVM variable so that log4j knows where to log.
Fixes #741

Location:

vlo/trunk

Files:

• vlo-distribution/src/main/assembly/installPackageBuilder.xml (modified) (4 diffs)
• vlo-importer/src/main/bin/vlo_solr_importer.sh (modified) (2 diffs)
• vlo-importer/src/main/resources/log4j.properties (modified) (1 diff)

vlo/trunk/vlo-distribution/src/main/assembly/installPackageBuilder.xml

@@ -57 +57 @@
             <filtered>true</filtered>
         </fileSet>
+        <!-- empty log directory -->
+        <fileSet>
+            <directory>src/main/assembly</directory>
+            <outputDirectory>log</outputDirectory>
+            <excludes>
+                <exclude>*</exclude>
+            </excludes>
+        </fileSet>
         <!-- config files -->
         <fileSet>
@@ -66 +74 @@
             </includes>
             <excludes>
-                <exclude>VloConfig.xml</exclude>
+                <exclude>VloConfig.xml</exclude>
             </excludes>
             <outputDirectory>bin</outputDirectory>
@@ -102 +110 @@
             <directory>src/main/assembly</directory>
             <excludes>
-                <exclude>*</exclude>
+                <exclude>*</exclude>
             </excludes>
             <outputDirectory>war/solr</outputDirectory>
@@ -111 +119 @@
             <directory>src/main/assembly</directory>
             <excludes>
-                <exclude>*</exclude>
+                <exclude>*</exclude>
             </excludes>
             <outputDirectory>war/vlo</outputDirectory>

vlo/trunk/vlo-importer/src/main/bin/vlo_solr_importer.sh

@@ -21 +21 @@
 fi
 
+LOGDIR=${DIR}/../log/
+echo Logging in ${LOGDIR}
+
 # Please specify the configuration to the importer via a system property or via
 # the command line. In case of a property add 
@@ -33 +36 @@
 # take preference over a specification as a property.
 
-$JAVA -Xmx2024M -cp "${DIR}:${DIR}/vlo-importer-${project.version}-importer.jar" eu.clarin.cmdi.vlo.importer.MetadataImporter -c "$CONFIG"
+$JAVA -Xmx2024M \
+    -cp "${DIR}:${DIR}/vlo-importer-3.2-SNAPSHOT-importer.jar" \
+    -DIMPORTER_LOG_DIR=${LOGDIR} \
+    eu.clarin.cmdi.vlo.importer.MetadataImporter -c "$CONFIG"
 

vlo/trunk/vlo-importer/src/main/resources/log4j.properties

@@ -6 +6 @@
 log4j.appender.Stdout.encoding=UTF-8
 
-log4j.appender.File.File=vlo-importer.log
+log4j.appender.File.File=${IMPORTER_LOG_DIR}vlo-importer.log
 log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.File.layout=org.apache.log4j.PatternLayout