Merge branch 'master' into 0.75-SNAPSHOT
Change-Id: I573d75058d8c23792c13d8a10f014fcbbdc9b33f
diff --git a/Dockerfile b/Dockerfile
index 3878b44..2b138d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Use alpine linux as base image
-FROM openjdk:19-alpine as builder
+FROM openjdk:19-alpine AS builder
# Copy repository respecting .dockerignore
COPY . /kustvakt
diff --git a/pom.xml b/pom.xml
index 1c9911b..7a42c73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<jetty.version>11.0.19</jetty.version>
<flyway.version>10.6.0</flyway.version>
<log4j.version>2.22.1</log4j.version>
- <krill.version>[0.63.1,)</krill.version>
+ <krill.version>[0.63.2,)</krill.version>
<koral.version>[0.44,)</koral.version>
</properties>
<profiles>
diff --git a/src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java b/src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java
index cbd9fb5..7bf7ccb 100644
--- a/src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java
+++ b/src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java
@@ -224,7 +224,12 @@
long start, end;
start = System.currentTimeMillis();
- VirtualCorpusCache.store(vcId, searchKrill.getIndex());
+ try {
+ VirtualCorpusCache.store(vcId, searchKrill.getIndex());
+ }
+ catch (Exception e) {
+ jlog.error("Failed caching vc "+vcId, e);
+ }
end = System.currentTimeMillis();
jlog.info("Duration : {}", (end - start));
config.setVcInCaching("");
@@ -239,13 +244,14 @@
private void storeVCinDB (String vcId, String koralQuery, QueryDO existingVC) {
try {
String info = (existingVC == null) ? "Storing" : "Updating";
- jlog.info("{} {} in database ", info, vcId);
+ jlog.info("{} {} in the database ", info, vcId);
vcService.storeQuery(existingVC, "system", vcId, ResourceType.SYSTEM,
QueryType.VIRTUAL_CORPUS, koralQuery, null, null, null,
true, "system", null, null);
}
- catch (KustvaktException e) {
+ catch (Exception e) {
+ jlog.error("Failed storing VC: "+vcId, e);
throw new RuntimeException(e);
}
}
diff --git a/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
index 8f7d80f..129cda2 100644
--- a/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
+++ b/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
@@ -9,7 +9,7 @@
public class KustvaktServer extends KustvaktBaseServer {
public static void main (String[] args) throws Exception {
- System.setProperty("log4j.configurationFile", "data/log4j2.properties, log4j2.properties");
+ System.setProperty("log4j.configurationFile", "data/log4j2.properties");
KustvaktServer server = new KustvaktServer();
kargs = server.readAttributes(args);
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/data/log4j2.properties
similarity index 98%
rename from src/main/resources/log4j2.properties
rename to src/main/resources/data/log4j2.properties
index 1201846..ed6307e 100644
--- a/src/main/resources/log4j2.properties
+++ b/src/main/resources/data/log4j2.properties
@@ -9,7 +9,7 @@
appender.file.name = MAINLOG
appender.file.fileName=./data/logs/kustvakt.log
appender.file.layout.type=PatternLayout
-appender.file.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
+appender.file.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n%xEx%n
appender.ldapFile.type = File
appender.ldapFile.name = LDAP_LOG