Skip to content

Commit

Permalink
refactor: remove logging configuration (GIScience#1679)
Browse files Browse the repository at this point in the history
  • Loading branch information
takb authored and selimguvenc committed Apr 25, 2024
1 parent 3aa02cc commit ca8cfc5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ graphs/
graphs-*/
target/
logs/
elevation-cache/
elevation_cache/
cgiar_cache/
node_modules/

Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ WORKDIR ${BASE_FOLDER}
# Copy over the needed bits and pieces from the other stages.
COPY --chown=ors:ors --from=tomcat /tmp/tomcat ${BASE_FOLDER}/tomcat
COPY --chown=ors:ors --from=build /ors-core/ors-api/target/ors.war ${BASE_FOLDER}/tomcat/webapps/ors.war
COPY --chown=ors:ors --from=build /ors-core/ors-api/src/main/resources/log4j-tomcat.properties ${BASE_FOLDER}/tomcat/conf/logging.properties
COPY --chown=ors:ors ./docker-entrypoint.sh ${BASE_FOLDER}/docker-entrypoint.sh
COPY --chown=ors:ors ./ors-config.yml ${BASE_FOLDER}/tmp/ors-config.yml
COPY --chown=ors:ors ./$OSM_FILE ${BASE_FOLDER}/tmp/osm_file.pbf
Expand Down
5 changes: 5 additions & 0 deletions ors-api/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ springdoc:

##### Logging settings #####
logging:
file:
name: ./logs/ors.log
pattern:
console: "%d{yyyy-MM-dd HH:mm:ss} %highlight{%-7p} %style{%50t}{Cyan} %style{[ %-40.40c{1.} ]}{Bright Cyan} %m%n"
file: "%d{yyyy-MM-dd HH:mm:ss} %p [%-40.40c{1.}] - %m%n"
level:
root: WARN
org.heigit: INFO
Expand Down
11 changes: 0 additions & 11 deletions ors-api/src/main/resources/log4j-tomcat.properties

This file was deleted.

27 changes: 0 additions & 27 deletions ors-api/src/main/resources/log4j2.yml

This file was deleted.

0 comments on commit ca8cfc5

Please sign in to comment.