Skip to content

Commit

Permalink
akkinoc
Browse files Browse the repository at this point in the history
  • Loading branch information
nkonev committed Jan 25, 2025
1 parent 67c64b6 commit 8a003ee
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 46 deletions.
12 changes: 12 additions & 0 deletions aaa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<skipTests>false</skipTests>
<owasp.encoder.version>1.2.3</owasp.encoder.version>
<liquibase.session.lock.version>1.6.9</liquibase.session.lock.version>
<logback-access-spring-boot-starter.version>4.4.0</logback-access-spring-boot-starter.version>
<logback-access.version>2.0.6</logback-access.version>
</properties>

Expand Down Expand Up @@ -267,6 +268,17 @@
<version>${owasp.encoder.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.1.12</version>
</dependency>

<dependency>
<groupId>dev.akkinoc.spring.boot</groupId>
<artifactId>logback-access-spring-boot-starter</artifactId>
<version>${logback-access-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.access</groupId>
<artifactId>logback-access-common</artifactId>
Expand Down
28 changes: 0 additions & 28 deletions aaa/src/main/java/name/nkonev/aaa/config/AccessLogConfig.java

This file was deleted.

18 changes: 0 additions & 18 deletions aaa/src/main/java/name/nkonev/aaa/config/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,4 @@ public RestTemplate restTemplate() {
.build();
}

// see https://github.com/spring-projects/spring-boot/issues/14302#issuecomment-418712080 if you want to customize management tomcat
@Bean
public ServletWebServerFactory servletContainer(Valve... valves) {
var tomcat = new TomcatServletWebServerFactory();
if (valves != null) {
tomcat.addContextValves(valves);
}
final File baseDir = serverProperties.getTomcat().getBasedir();
if (baseDir!=null) {
File docRoot = new File(baseDir, "document-root");
docRoot.mkdirs();
tomcat.setDocumentRoot(docRoot);
}

tomcat.setProtocol("org.apache.coyote.http11.Http11Nio2Protocol");

return tomcat;
}
}
1 change: 1 addition & 0 deletions aaa/src/main/resources/config/c.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ https://github.com/spring-projects/spring-boot/tree/main/spring-boot-project/spr
<level>${CONSOLE_LOG_THRESHOLD}</level>
</filter>
<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
<pattern>%fullRequest%n%n%fullResponse</pattern>
<format>${CONSOLE_LOG_STRUCTURED_FORMAT}</format>
<charset>${CONSOLE_LOG_CHARSET}</charset>
</encoder>
Expand Down

0 comments on commit 8a003ee

Please sign in to comment.