#207 Fix logback

cloudogu · Mar 29, 2023 · 3956136 · 3956136
1 parent 0aea5fb
commit 3956136
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -146,13 +146,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.20</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.4.6</version>
         </dependency>
 
         <!-- Used to extract the version at runtime -->

diff --git a/resources/startup.sh b/resources/startup.sh
@@ -41,12 +41,10 @@ if [[ "$(doguctl config "container_config/memory_limit" -d "empty")" == "empty"
   java -Djava.awt.headless=true \
        -Djava.net.preferIPv4Stack=true \
        -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
+       -Dlogging.config=/app/logback.xml \
        -Djavax.net.ssl.trustStorePassword=changeit \
        -jar /app/smeagol.war
 
-#       -Dlogging.config=/app/logback.xml \
-        # TODO
-
 else
   # Retrieve configurable java limits from etcd, valid default values exist
   MEMORY_LIMIT_MAX_PERCENTAGE=$(doguctl config "container_config/java_max_ram_percentage")
@@ -57,10 +55,10 @@ else
        -Djava.net.preferIPv4Stack=true \
        -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
        -Djavax.net.ssl.trustStorePassword=changeit \
+       -Dlogging.config=/app/logback.xml \
        -XX:MaxRAMPercentage="${MEMORY_LIMIT_MAX_PERCENTAGE}" \
        -XX:MinRAMPercentage="${MEMORY_LIMIT_MIN_PERCENTAGE}" \
        -jar /app/smeagol.war
 
-       #       -Dlogging.config=/app/logback.xml \
        # TODO
 fi