Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #241: Add logstash-logback-encoder dependency #242

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Fix #241: Add logstash-logback-encoder dependency #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@

<bc.version>1.76</bc.version>
<springdoc-openapi-starter-webmvc-ui.version>2.2.0</springdoc-openapi-starter-webmvc-ui.version>
<logstash.version>7.4</logstash.version>
</properties>

<modules>
Expand Down Expand Up @@ -141,6 +142,13 @@
<artifactId>enrollment-server-onboarding-api-model</artifactId>
<version>${enrollment-server.version}</version>
</dependency>

<!-- Logging -->
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
3 changes: 3 additions & 0 deletions powerauth-test-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENV JAVA_HOME=/opt/java/openjdk \
TOMCAT_HOME=/usr/local/tomcat \
TOMCAT_MAJOR=10 \
TOMCAT_VERSION=10.1.7 \
LOGBACK_CONF=/opt/logback/conf \
TZ=UTC

ENV PATH=$PATH:$TOMCAT_HOME/bin
Expand Down Expand Up @@ -47,4 +48,6 @@ STOPSIGNAL SIGQUIT

USER powerauth

COPY deploy/conf/logback/* $LOGBACK_CONF/

CMD ["catalina.sh", "run"]
13 changes: 13 additions & 0 deletions powerauth-test-server/deploy/conf/logback/pts-logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<includeMdc>true</includeMdc>
<customFields>{"appname":"powerauth-test-server"}</customFields>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="CONSOLE"/>
</root>
</configuration>
1 change: 1 addition & 0 deletions powerauth-test-server/docker/env.list.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ POWERAUTH_TEST_SERVER_ENROLLMENT_SERVER_URL=http://localhost:8080/enrollment-ser
POWERAUTH_TEST_SERVER_DATASOURCE_URL=jdbc:postgresql://host.docker.internal:5432/powerauth
POWERAUTH_TEST_SERVER_DATASOURCE_USERNAME=powerauth
POWERAUTH_TEST_SERVER_DATASOURCE_PASSWORD=
POWERAUTH_TEST_SERVER_LOGGING=

LIQUIBASE_ENABLED=false
POWERAUTH_CLOUD_SERVICE_BASE_URL=
Expand Down
3 changes: 3 additions & 0 deletions powerauth-test-server/docker/powerauth-test-server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@
<Parameter name="spring.liquibase.parameters.pa-cloud-admin-username" value="${POWERAUTH_CLOUD_ADMIN_USERNAME:}"/>
<Parameter name="spring.liquibase.parameters.pa-cloud-admin-password-encoded" value="${POWERAUTH_CLOUD_ADMIN_PASSWORD_ENCODED:}"/>

<!-- Logging -->
<Parameter name="logging.config" value="${POWERAUTH_TEST_SERVER_LOGGING:}"/>

</Context>
6 changes: 6 additions & 0 deletions powerauth-test-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@
<artifactId>bcprov-jdk18on</artifactId>
</dependency>

<!-- Logging -->
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>

<!-- Documentation -->
<dependency>
<groupId>org.springdoc</groupId>
Expand Down
2 changes: 2 additions & 0 deletions powerauth-test-server/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ spring.liquibase.change-log=classpath:db/changelog/liquibase-changelog.xml
spring.liquibase.parameters.pa-cloud-service-base-url=
spring.liquibase.parameters.pa-cloud-admin-username=
spring.liquibase.parameters.pa-cloud-admin-password-encoded=

logging.config=${POWERAUTH_TEST_SERVER_LOGGING:}