Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve log appender conflict when resuming an ingest #31

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Resolve log appender conflict when resuming an ingest #31

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e3f1fa5
EPICify v2
pautri Dec 12, 2023
b4b90b0
Update config-log.xsl
pautri Dec 12, 2023
0b3c13f
stopping log appenders such that they can be initialised again in a r…
pautri Jan 11, 2024
531744a
Update config-log.xsl
pautri Jan 15, 2024
9f578fb
attempt to fix issue with logging within threads
pautri Jan 28, 2025
cf4e6d5
Update config-log.xsl
pautri Jan 30, 2025
87716f8
Update FITS.java
pautri Jan 30, 2025
102329c
Update FITS.java
pautri Jan 30, 2025
e74c4e3
Update FITS.java
pautri Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
<artifactId>fluent-hc</artifactId>
<version>4.5.1</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.2</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.2</version>
</dependency>
<dependency>
<groupId>net.sf.supercsv</groupId>
<artifactId>super-csv</artifactId>
<version>2.4.0</version>
</dependency>

<!-- validation -->
<dependency>
<groupId>eu.clarin.cmdi</groupId>
Expand Down Expand Up @@ -89,7 +89,7 @@
<dependency>
<groupId>nl.knaw.meertens.pid</groupId>
<artifactId>epicify-lib</artifactId>
<version>1.0</version>
<version>2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down
25 changes: 19 additions & 6 deletions src/main/java/nl/mpi/tla/flat/deposit/action/WorkspaceLogCleanup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,35 @@
package nl.mpi.tla.flat.deposit.action;

import nl.mpi.tla.flat.deposit.Context;
import org.slf4j.Logger;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import java.util.Iterator;

/**
*
* @author menzowi
* @author menzowi, pautri
*/
public class WorkspaceLogCleanup extends AbstractAction {

private static final Logger logger = LoggerFactory.getLogger(WorkspaceLogCleanup.class.getName());


private static final LoggerContext ctx = (LoggerContext) LoggerFactory.getILoggerFactory();
private static final Logger logger = ctx.getLogger("nl.mpi.tla.flat.deposit");

@Override
public boolean perform(Context context) {

for (Iterator<Appender<ILoggingEvent>> index = logger.iteratorForAppenders(); index.hasNext();) {
Appender<ILoggingEvent> appender = index.next();
if (appender.getName().equals("USER") || appender.getName().equals("DEVEL")) {
appender.stop();
}
}

MDC.remove("sip");
return true;
}

}
44 changes: 25 additions & 19 deletions src/main/resources/WorkspaceLog/config-log.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
<xsl:template match="configuration">
<xsl:copy>
<appender name="DEVEL" class="ch.qos.logback.core.FileAppender">
<file><xsl:value-of select="$dir"/>/devel.log</file>
<file>
<xsl:value-of select="$dir"/>
/devel.log</file>
<append>true</append>
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>
<expression>return (mdc.get("sip") != null &amp;&amp; ((String)mdc.get("sip")).equals("<xsl:value-of select="$sip"/>"));</expression>
<expression>return (mdc.get("sip") != null &amp;&amp; ((String)mdc.get("sip")).equals("<xsl:value-of select="$sip"/>
"));</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
<OnMatch>ACCEPT</OnMatch>
Expand All @@ -28,23 +31,26 @@
</encoder>
</appender>
<appender name="USER" class="ch.qos.logback.core.FileAppender">
<file><xsl:value-of select="$dir"/>/user-log-events.xml</file>
<file>
<xsl:value-of select="$dir"/>
/user-log-events.xml</file>
<append>true</append>\n" + <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>\n" + <expression>return (level >= INFO &amp;&amp; mdc.get("sip") != null &amp;&amp; ((String)mdc.get("sip")).equals("<xsl:value-of select="$sip"/>"));</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
<OnMatch>ACCEPT</OnMatch>
</filter>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="ch.qos.logback.classic.log4j.XMLLayout"/>
</encoder>
</appender>
<logger name="nl.mpi.tla.flat.deposit" level="DEBUG">
<appender-ref ref="USER"/>
<appender-ref ref="DEVEL"/>
</logger>
<xsl:apply-templates select="@* | node()"/>
</xsl:copy>
</xsl:template>
<evaluator>\n" + <expression>return (level >= INFO &amp;&amp; mdc.get("sip") != null &amp;&amp; ((String)mdc.get("sip")).equals("<xsl:value-of select="$sip"/>
"));</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
<OnMatch>ACCEPT</OnMatch>
</filter>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="ch.qos.logback.classic.log4j.XMLLayout"/>
</encoder>
</appender>
<logger name="nl.mpi.tla.flat.deposit" level="DEBUG">
<appender-ref ref="USER"/>
<appender-ref ref="DEVEL"/>
</logger>
<xsl:apply-templates select="@* | node()"/>
</xsl:copy>
</xsl:template>

</xsl:stylesheet>