diff --git a/README.md b/README.md index 4c2c56b3..813f4f3e 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,22 @@ -Данный репозиторий содержит файлы, которые повторяются от проекта к проекту и могут быть шаблонизированы. +Данный репозиторий содержит шаблоны (используемых в сервисах домена) ресурсов -Для этого в pom нужно добавить: +#Переопределяемые настройки `logback` +`application.yml` +```yaml +logback: + appender: JSON_K8S_CONSOLE # возможные значения: DEFAULT_CONSOLE || COLOR_CONSOLE || JSON_K8S_CONSOLE ``` - - 8022 - f26fcc19d1941ab74f1c72dd8a408be17a769333 - 1.151-4018c41 - 1.0.0 -... +#`pom.xml` +```xml dev.vality shared-resources ${shared.resources.version} - -... - +``` +```xml ${project.build.directory}/maven-shared-archive-resources @@ -39,7 +38,8 @@ true - +``` +```xml org.apache.maven.plugins maven-remote-resources-plugin @@ -67,8 +67,3 @@ ``` - -после этого можно удалить локальные файлы: -1. Dockerfile -1. git.properties -1. logback-spring.xml diff --git a/pom.xml b/pom.xml index 92e80aee..a32be592 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 1.0.0 + 1.0.1 jar Java shared resources diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index 40a7c0a5..b07ce640 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,4 +1,3 @@ -# @dockerfile.Template@ FROM openjdk:15-jdk-slim RUN useradd -s /bin/false -U -u 20000 vality @@ -7,7 +6,7 @@ COPY --chown=vality:vality @artifactId@-@version@.jar /opt/@artifactId@/@artifac USER vality:vality -CMD ["java", "-Xmx256m", "-jar","/opt/@artifactId@/@artifactId@.jar"] +CMD ["java", "-jar","/opt/@artifactId@/@artifactId@.jar"] EXPOSE @exposed.ports@ diff --git a/src/main/resources/dev/vality/sharedresources/logback/console-appender.xml b/src/main/resources/dev/vality/sharedresources/logback/console-appender.xml deleted file mode 100644 index a910da91..00000000 --- a/src/main/resources/dev/vality/sharedresources/logback/console-appender.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - { - "@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}", - "@severity": "%level" - } - - - - - 20 - true - - - - - - diff --git a/src/main/resources/dev/vality/sharedresources/logback/properties-appender.xml b/src/main/resources/dev/vality/sharedresources/logback/properties-appender.xml deleted file mode 100644 index b1bbaf32..00000000 --- a/src/main/resources/dev/vality/sharedresources/logback/properties-appender.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index ed6bc34a..5bcd4333 100755 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -1,25 +1,70 @@ - - - + + + + + + ${CONSOLE_LOG_PATTERN} + ${CONSOLE_LOG_CHARSET} + + + + + + + %black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx + + + + + + + + + + + { + "@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}", + "@severity": "%level", + "thread_name": "%thread", + "logger_name": "%logger", + "message": "%message" + } + + + + + 30 + 2048 + 20 + ^sun\.reflect\..*\.invoke + ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke + true + + + + + - + - - - - - - + + + + + + + + + + + - - -