root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish 

Make logger a static field.
This commit is contained in:
Andy Wilkinson 2023-05-17 13:16:44 -07:00 committed by Phillip Webb
parent 1e29053886
commit 3d41e41b94
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCli.java
View File

@ -39,7 +39,7 @@ import org.springframework.core.log.LogMessage;
*/ */
class DockerCli { class DockerCli {
private final Log logger = LogFactory.getLog(DockerCli.class); private static final Log logger = LogFactory.getLog(DockerCli.class);
private final ProcessRunner processRunner; private final ProcessRunner processRunner;
@ -68,7 +68,7 @@ class DockerCli {
private List<String> getDockerCommand(ProcessRunner processRunner) { private List<String> getDockerCommand(ProcessRunner processRunner) {
try { try {
String version = processRunner.run("docker", "version", "--format", "{{.Client.Version}}"); String version = processRunner.run("docker", "version", "--format", "{{.Client.Version}}");
this.logger.trace(LogMessage.format("Using docker %s", version)); logger.trace(LogMessage.format("Using docker %s", version));
return List.of("docker"); return List.of("docker");
} }
catch (ProcessStartException ex) { catch (ProcessStartException ex) {
@ -89,7 +89,7 @@ class DockerCli {
DockerCliComposeVersionResponse response = DockerJson.deserialize( DockerCliComposeVersionResponse response = DockerJson.deserialize(
processRunner.run("docker", "compose", "version", "--format", "json"), processRunner.run("docker", "compose", "version", "--format", "json"),
DockerCliComposeVersionResponse.class); DockerCliComposeVersionResponse.class);
this.logger.trace(LogMessage.format("Using docker compose %s", response.version())); logger.trace(LogMessage.format("Using docker compose %s", response.version()));
return List.of("docker", "compose"); return List.of("docker", "compose");
} }
catch (ProcessExitException ex) { catch (ProcessExitException ex) {
@ -99,7 +99,7 @@ class DockerCli {
DockerCliComposeVersionResponse response = DockerJson.deserialize( DockerCliComposeVersionResponse response = DockerJson.deserialize(
processRunner.run("docker-compose", "version", "--format", "json"), processRunner.run("docker-compose", "version", "--format", "json"),
DockerCliComposeVersionResponse.class); DockerCliComposeVersionResponse.class);
this.logger.trace(LogMessage.format("Using docker-compose %s", response.version())); logger.trace(LogMessage.format("Using docker-compose %s", response.version()));
return List.of("docker-compose"); return List.of("docker-compose");
} }
catch (ProcessStartException ex) { catch (ProcessStartException ex) {
@ -127,7 +127,7 @@ class DockerCli {
if (logLevel == null || logLevel == LogLevel.OFF) { if (logLevel == null || logLevel == LogLevel.OFF) {
return null; return null;
} }
return (line) -> logLevel.log(this.logger, line); return (line) -> logLevel.log(logger, line);
} }
private List<String> createCommand(Type type) { private List<String> createCommand(Type type) {