Skip to content

Commit

Permalink
Refactor : Mise en place conf unique log4j
Browse files Browse the repository at this point in the history
Suppression rotation des logs dans fichiers
Suppression affichage bannière spring dans les logs
  • Loading branch information
pierre-maraval committed Jun 20, 2024
1 parent 08a76d5 commit b36abe2
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 826 deletions.
1 change: 1 addition & 0 deletions batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
Expand Down
8 changes: 4 additions & 4 deletions batch/src/main/resources/application-dev.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ spring.datasource.item.driver-class-name=org.postgresql.Driver
spring.jpa.item.generate-ddl=false
spring.jpa.item.show-sql=false
spring.jpa.item.hibernate.ddl-auto=none
spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect
spring.sql.item.init.mode=never
spring.hibernate.item.enable_lazy_load_no_trans=true

Expand All @@ -17,9 +16,8 @@ spring.datasource.basexml.password=
spring.datasource.basexml.driver-class-name=oracle.jdbc.OracleDriver

spring.jpa.basexml.generate-ddl=false
spring.jpa.basexml.show-sql=true
spring.jpa.basexml.show-sql=false
spring.jpa.basexml.hibernate.ddl-auto=none
spring.jpa.basexml.database-platform=org.hibernate.dialect.OracleDialect
spring.sql.basexml.init.mode=never
spring.hibernate.basexml.enable_lazy_load_no_trans=false

Expand All @@ -31,4 +29,6 @@ sudoc.login=
batch.min.hour=8
batch.max.hour=20

spring.batch.jdbc.initialize-schema=always
# Configuration des logs
logging.level.root=INFO
logging.level.fr.abes.item=INFO
6 changes: 4 additions & 2 deletions batch/src/main/resources/application-prod.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spring.datasource.item.driver-class-name=org.postgresql.Driver
spring.jpa.item.generate-ddl=false
spring.jpa.item.show-sql=false
spring.jpa.item.hibernate.ddl-auto=none
spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect
spring.sql.item.init.mode=never
spring.hibernate.item.enable_lazy_load_no_trans=true

Expand All @@ -20,7 +19,6 @@ spring.datasource.basexml.driver-class-name=oracle.jdbc.OracleDriver
spring.jpa.basexml.generate-ddl=false
spring.jpa.basexml.show-sql=false
spring.jpa.basexml.hibernate.ddl-auto=none
spring.jpa.basexml.database-platform=org.hibernate.dialect.OracleDialect
spring.sql.basexml.init.mode=never
spring.hibernate.basexml.enable_lazy_load_no_trans=false

Expand All @@ -33,3 +31,7 @@ batch.min.hour=8
batch.max.hour=20

spring.batch.jdbc.initialize-schema=never

# Configuration des logs
logging.level.root=WARN
logging.level.fr.abes.item=WARN
6 changes: 4 additions & 2 deletions batch/src/main/resources/application-test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spring.datasource.item.driver-class-name=org.postgresql.Driver
spring.jpa.item.generate-ddl=false
spring.jpa.item.show-sql=false
spring.jpa.item.hibernate.ddl-auto=none
spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect
spring.sql.item.init.mode=never
spring.hibernate.item.enable_lazy_load_no_trans=true

Expand All @@ -20,7 +19,6 @@ spring.datasource.basexml.driver-class-name=oracle.jdbc.OracleDriver
spring.jpa.basexml.generate-ddl=false
spring.jpa.basexml.show-sql=false
spring.jpa.basexml.hibernate.ddl-auto=none
spring.jpa.basexml.database-platform=org.hibernate.dialect.OracleDialect
spring.sql.basexml.init.mode=never
spring.hibernate.basexml.enable_lazy_load_no_trans=false

Expand All @@ -33,3 +31,7 @@ batch.min.hour=8
batch.max.hour=20

spring.batch.jdbc.initialize-schema=never

# Configuration des logs
logging.level.root=INFO
logging.level.fr.abes.item=INFO
9 changes: 5 additions & 4 deletions batch/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Configuration du projet (depuis pom.xml)
spring.profiles.active=@spring.profiles.active@
application.name=@project.artifactId@
application.version=@project.version@
application.basedir=@batchBaseDir@

batch.nbPpnInFileResult=5

mail.ws.url=https://apicom.sudoc.fr/wsmail/
mail.admin=item@abes.fr

files.upload.path=/workdir/
files.upload.statistiques.path=/stat/
files.upload.statistiques.path=/stat/

# Configuration des logs
logging.config=classpath:log4j2.xml
spring.main.banner-mode=off
133 changes: 0 additions & 133 deletions batch/src/main/resources/log4j2-dev.xml

This file was deleted.

132 changes: 0 additions & 132 deletions batch/src/main/resources/log4j2-prod.xml

This file was deleted.

Loading

0 comments on commit b36abe2

Please sign in to comment.