Skip to content

Commit cc14ce5

Browse files
author
dterefe
committed
Deployment ready.
1 parent 3a1c70e commit cc14ce5

File tree

8 files changed

+45
-12
lines changed

8 files changed

+45
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ replay_pid*
2727
.vscode/
2828
mongodb_data/*
2929
package-lock.json
30+
DUUIRestService/files/upload/*

DUUIRestService/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
# Verwenden Sie das offizielle OpenJDK 17 Image als Basis
2-
# FROM maven:3.8.5-openjdk-17
3-
FROM maven:3.9.6-eclipse-temurin-21
1+
# FROM maven:3.9.6-eclipse-temurin-21
2+
FROM eclipse-temurin:21-jdk-jammy
3+
4+
RUN apt-get update && \
5+
apt-get install -y maven && \
6+
apt-get clean
7+
8+
# Optional: Version check
9+
RUN java -version && mvn -version
410

511
# Setzen Sie das Arbeitsverzeichnis im Container
612
WORKDIR /app

DUUIRestService/build_run.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export PORT=8085
2-
export LOCAL_DRIVE_ROOT=/home/stud_homes/s0424382/
2+
export LOCAL_DRIVE_ROOT=DUUIRestService/files/upload
33
export HOST=localhost
44
export MONGO_HOST=localhost
55
export MONGO_DB=duui
@@ -13,9 +13,9 @@ export GOOGLE_CLIENT_ID=
1313
export GOOGLE_CLIENT_SECRET=
1414
export GOOGLE_REDIRECT_URI=http://localhost:5173/account/google
1515

16-
mvn clean compile
17-
mvn exec:java -Dexec.mainClass="org.texttechnologylab.duui.api.Main"
18-
#mvn clean package
19-
#java -jar target/DUUIRestService.jar
16+
# mvn clean compile
17+
# mvn exec:java -Dexec.mainClass="org.texttechnologylab.duui.api.Main"
18+
mvn clean package
19+
java -jar target/DUUIRestService.jar
2020

2121
#mvn compile exec:java

DUUIRestService/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<maven.compiler.target>21</maven.compiler.target>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<maven.javadoc.skip>true</maven.javadoc.skip>
43-
<duui.version>275fd0123fcd9206741e00034e7e8723a4632d5e</duui.version>
43+
<duui.version>efaf4412ee</duui.version>
4444
<uima.version>3.5.0</uima.version>
4545
<typesystem.version>3.0.8</typesystem.version>
4646
<maven.javadoc.skip>false</maven.javadoc.skip>
@@ -335,9 +335,12 @@
335335
<version>${uima.version}</version>
336336
</dependency>
337337
<dependency>
338+
<!-- <groupId>org.texttechnologylab</groupId> -->
338339
<groupId>com.github.dterefe</groupId>
339340
<artifactId>DockerUnifiedUIMAInterface</artifactId>
341+
<!-- <version>1.5.0</version> -->
340342
<version>${duui.version}</version>
343+
341344
<exclusions>
342345
<exclusion>
343346
<groupId>org.mongodb</groupId>

DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Main.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@
4949
import static com.mongodb.client.model.Filters.*;
5050
import static com.mongodb.client.model.Projections.*;
5151
import static com.mongodb.client.model.Accumulators.*;
52+
5253
import static org.texttechnologylab.duui.api.storage.DUUIMongoDBStorage.formatDocument;
54+
5355
import static spark.Spark.port;
56+
import static spark.Spark.threadPool;
5457

5558
/*
5659
* To build follow these steps for now:
@@ -105,6 +108,11 @@ public static void main(String[] args) {
105108
DUUIMongoDBStorage.init(config);
106109
DUUIMetricsManager.init();
107110

111+
threadPool(
112+
/* maxThreads */ 100,
113+
/* minThreads */ 10,
114+
/* idleTimeoutMs */ 30000
115+
);
108116

109117
try {
110118
port(config.getPort());

DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
*/
2929
public class Methods {
3030

31-
private static Logger log = LoggerFactory.getLogger(Methods.class);
31+
private static final Logger log = LoggerFactory.getLogger(Methods.class);
32+
3233

3334
/**
3435
* Initializes all endpoints including filters and options.

DUUIRestService/src/main/resources/logback.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,20 @@
2525
<!-- </encoder>-->
2626
<!-- </appender>-->
2727

28+
<appender name="ASYNC_CONSOLE" class="ch.qos.logback.classic.AsyncAppender">
29+
<!-- wie viele Log‐Events im Puffer, bevor verworfen wird -->
30+
<queueSize>5000</queueSize>
31+
<!-- ab welcher Füllung ältere Events verworfen werden sollen (0–100) -->
32+
<discardingThreshold>0</discardingThreshold>
33+
<!-- verweist auf den realen Console‐Appender -->
34+
<appender-ref ref="CONSOLE" />
35+
</appender>
36+
2837
<logger name="org.texttechnologylab.duui.api.controllers.users" level="TRACE"/>
2938

3039
<!-- 3) Root logger: send everything ≥ INFO to console & file -->
3140
<root level="INFO">
32-
<appender-ref ref="CONSOLE" />
41+
<appender-ref ref="ASYNC_CONSOLE" />
3342
<!-- <appender-ref ref="FILE" />-->
3443
</root>
3544

docker-compose.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ services:
66
context: ./DUUIRestService
77
dockerfile: Dockerfile # or Dockerfile-rest-service, if that's the file name
88
container_name: duui-gateway-backend
9+
ulimits:
10+
nofile:
11+
soft: 65535
12+
hard: 65535
13+
pids_limit: 4096
914
volumes:
1015
# Mount the Docker socket so the backend can start containers
1116
- /var/run/docker.sock:/var/run/docker.sock
12-
- /:/app/drives
17+
- ./DUUIRestService/files/upload:/app/drives:cached
1318
environment:
1419
- PORT=2605
1520
- HOST=duui-gateway-backend

0 commit comments

Comments
 (0)