Merge pull request #51 from abes-esr/develop

merge dev to test
abes-esr · Dec 11, 2024 · ab7a9e5 · ab7a9e5
2 parents 15a3914 + 8db86f9
commit ab7a9e5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <groupId>fr.abes</groupId>
     <artifactId>logskbart-api</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>logskbart-api</name>
     <description>Api de récupération de logs dans Kafka pour stockage dans BDD et fourniture</description>

diff --git a/src/main/java/fr/abes/logskbart/kafka/LogsListener.java b/src/main/java/fr/abes/logskbart/kafka/LogsListener.java
@@ -78,7 +78,9 @@ public void listenInfoKbart2KafkaAndErrorKbart2Kafka(ConsumerRecord<String, Stri
 
             if ((dto.getMessage().contains("Traitement terminé pour fichier " + packageName)) || (dto.getMessage().contains("Traitement refusé du fichier " + packageName))) {
                 saveDatas(workInProgressMap.get(packageName).getMessages());
-                if (!packageName.contains("_FORCE")) {
+                if (!packageName.contains("_FORCE") || workInProgressMap.get(packageName).getMessages().stream().anyMatch(log ->
+                    (log.getNbLine() == -1) && log.getMessage().equals("Format du fichier incorrect")
+                )) {
                     createFileBad(packageName);
                 }
                 workInProgressMap.remove(packageName);

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -5,7 +5,7 @@
         <!-- CONSOLE -->
         <Console name="Console">
             <PatternLayout
-                    pattern="%style{%d{ISO8601}}{black} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%C{1.}}{dark,yellow}: %msg%n%throwable" />
+                    pattern="%style{%d{ISO8601}}{white} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%C{1.}}{dark,yellow}: %msg%n%throwable"/>
         </Console>
     </Appenders>
     <Loggers>