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

Polish "Log the reason that led Devtools to restart the app" 

See gh-28495
This commit is contained in:
Stephane Nicoll 2022-01-03 14:30:56 +01:00
parent 0769b33e2e
commit b81c0047f8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -20,6 +20,9 @@ import java.io.File;
import java.net.URL; import java.net.URL;
import java.util.List; import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -94,6 +97,8 @@ public class LocalDevToolsAutoConfiguration {
@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true) @ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
static class RestartConfiguration { static class RestartConfiguration {
private static final Log restarterLogger = LogFactory.getLog(Restarter.class);
private final DevToolsProperties properties; private final DevToolsProperties properties;
RestartConfiguration(DevToolsProperties properties) { RestartConfiguration(DevToolsProperties properties) {
@ -105,6 +110,10 @@ public class LocalDevToolsAutoConfiguration {
FileSystemWatcherFactory fileSystemWatcherFactory) { FileSystemWatcherFactory fileSystemWatcherFactory) {
return (event) -> { return (event) -> {
if (event.isRestartRequired()) { if (event.isRestartRequired()) {
if (restarterLogger.isDebugEnabled()) {
restarterLogger.debug(
"Application restart required due to the following changes: " + event.getChangeSet());
}
Restarter.getInstance().restart(new FileWatchingFailureHandler(fileSystemWatcherFactory)); Restarter.getInstance().restart(new FileWatchingFailureHandler(fileSystemWatcherFactory));
} }
}; };

8
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListener.java
View File

@ -18,9 +18,6 @@ package org.springframework.boot.devtools.classpath;
import java.util.Set; import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.devtools.filewatch.ChangedFile; import org.springframework.boot.devtools.filewatch.ChangedFile;
import org.springframework.boot.devtools.filewatch.ChangedFiles; import org.springframework.boot.devtools.filewatch.ChangedFiles;
import org.springframework.boot.devtools.filewatch.FileChangeListener; import org.springframework.boot.devtools.filewatch.FileChangeListener;
@ -38,8 +35,6 @@ import org.springframework.util.Assert;
*/ */
class ClassPathFileChangeListener implements FileChangeListener { class ClassPathFileChangeListener implements FileChangeListener {
private static final Log logger = LogFactory.getLog(ClassPathFileChangeListener.class);
private final ApplicationEventPublisher eventPublisher; private final ApplicationEventPublisher eventPublisher;
private final ClassPathRestartStrategy restartStrategy; private final ClassPathRestartStrategy restartStrategy;
@ -65,9 +60,6 @@ class ClassPathFileChangeListener implements FileChangeListener {
@Override @Override
public void onChange(Set<ChangedFiles> changeSet) { public void onChange(Set<ChangedFiles> changeSet) {
boolean restart = isRestartRequired(changeSet); boolean restart = isRestartRequired(changeSet);
if (restart && logger.isDebugEnabled()) {
logger.debug("Restarting dev tools due to changes in the following files: " + changeSet);
}
publishEvent(new ClassPathChangedEvent(this, changeSet, restart)); publishEvent(new ClassPathChangedEvent(this, changeSet, restart));
} }