From 82cdfa117ea2461e55ae02b60358c9d5909ea936 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 5 Mar 2025 14:59:25 -0700
Subject: [PATCH 1/3] add logback version
---
gradle.properties | 1 +
gradle/dependencies.gradle | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 35bb5445..0d8c0d1f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,7 @@ grgitVersion = 4.1.1
jacksonVersion = 2.9.0
jgitVersion = 6.7.0.202309050840-r
junitVersion = 5.8.2
+logbackVersion = 1.3.15
micronautAppVersion = 3.7.10
micronautVersion = 3.10.1
nodePluginVersion = 3.0.1
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 1bfbad2d..c8b45342 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -20,7 +20,7 @@ dependencies {
implementation("jakarta.annotation:jakarta.annotation-api")
implementation("io.micronaut.aws:micronaut-function-aws-api-proxy")
implementation("io.micronaut:micronaut-http-server-netty")
- runtimeOnly("ch.qos.logback:logback-classic")
+ runtimeOnly("ch.qos.logback:logback-classic:${logbackVersion}")
// Swagger
annotationProcessor("io.micronaut.openapi:micronaut-openapi")
--
GitLab
From 05dee4839ae6f81aa22871ebe7b0b362d802bf08 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 5 Mar 2025 14:59:36 -0700
Subject: [PATCH 2/3] change config
---
src/main/resources/logback.xml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index f74e4169..087a74cc 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,13 +1,10 @@
<configuration>
- <appender name="STDOUT"
- class="ch.qos.logback.core.ConsoleAppender">
- <withJansi>true</withJansi>
- <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder
- by default -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread])
- %highlight(%-5level) %magenta(%logger{36}) - %msg%n</pattern>
+ <pattern>
+ %cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) %X{remoteIp} - %msg%n
+ </pattern>
</encoder>
</appender>
--
GitLab
From 12316bf115d5b4ac703994974eec693159b5c984 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 5 Mar 2025 15:07:28 -0700
Subject: [PATCH 3/3] format
---
src/main/resources/logback.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 087a74cc..0c5b2ab4 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,9 +1,11 @@
<configuration>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <appender name="STDOUT"
+ class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- %cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) %X{remoteIp} - %msg%n
+ %cyan(%d{HH:mm:ss.SSS}) %gray([%thread])
+ %highlight(%-5level) %magenta(%logger{36}) %X{remoteIp} - %msg%n
</pattern>
</encoder>
</appender>
--
GitLab