apply fix to windows env and remove duplicate logging for checksum ch…

…ecker
atmire · Dec 4, 2024 · 18730cc · 18730cc
1 parent 529c3a7
commit 18730cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 27 deletions.
diff --git a/dspace/bin/dspace.bat b/dspace/bin/dspace.bat
@@ -38,6 +38,9 @@ REM If JAVA_OPTS specified, use those options
 REM Otherwise, default Java to using 256MB of memory
 if "%JAVA_OPTS%"=="" set "JAVA_OPTS=-Xmx256m -Dfile.encoding=UTF-8"
 
+REM Add log4j2 configuration to JAVA_OPTS
+set "JAVA_OPTS=%JAVA_OPTS% -Dlog4j2.configurationFile=%DSPACE_CLASSPATH%\config\log4j2-cli.xml"
+
 REM Execute Java
 java %JAVA_OPTS% -classpath "%DSPACE_CLASSPATH%" org.dspace.app.launcher.ScriptLauncher %*
 

diff --git a/dspace/config/log4j2.xml b/dspace/config/log4j2.xml
@@ -44,26 +44,6 @@
             </DefaultRolloverStrategy>
             -->
         </Appender>
-
-        <!-- A2 is for the checksum checker -->
-        <Appender name='A2'
-                  filePattern="${log.dir}/checker.log-%d{yyyy-MM-dd}"
-                  type='RollingFile'
-                  fileName='${log.dir}/checker.log'>
-            <Layout type='PatternLayout'
-                    pattern='%m%n'/>
-            <policies>
-                <policy type='TimeBasedTriggeringPolicy'>yyyy-MM-dd</policy>
-            </policies>
-            <!-- Sample deletion policy:  keep last 30 archived files
-            <DefaultRolloverStrategy>
-                <Delete basePath='${log.dir}'>
-                    <IfFileName glob='checker.log-*'/>
-                    <IfAccumulatedFileCount exceeds='30'/>
-                </Delete>
-            </DefaultRolloverStrategy>
-            -->
-        </Appender>
     </Appenders>
 
     <Loggers>
@@ -75,13 +55,6 @@
             <AppenderRef ref='A1'/>
         </Logger>
 
-        <!-- The checksum checker -->
-        <Logger name='org.dspace.checker'
-                level='INFO'
-                additivity='false'>
-            <AppenderRef ref='A2'/>
-        </Logger>
-
         <!-- Block services logging except on exceptions -->
         <Logger name='org.dspace.kernel'
                 level='ERROR'/>