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

Use 3 decimal places at most for logged startup time 

Fixes gh-18278
This commit is contained in:
Andy Wilkinson 2019-09-19 10:18:23 +01:00
parent 7d3e53c94c
commit 39c1e47eb7
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
View File

@ -87,7 +87,7 @@ class StartupInfoLogger {
message.append("Started "); message.append("Started ");
appendApplicationName(message); appendApplicationName(message);
message.append(" in "); message.append(" in ");
message.append(stopWatch.getTotalTimeSeconds()); message.append(stopWatch.getTotalTimeMillis() / 1000.0);
message.append(" seconds"); message.append(" seconds");
try { try {
double uptime = ManagementFactory.getRuntimeMXBean().getUptime() / 1000.0; double uptime = ManagementFactory.getRuntimeMXBean().getUptime() / 1000.0;

17
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/StartUpLoggerTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/StartupInfoLoggerTests.java
View File

@ -20,6 +20,8 @@ import org.apache.commons.logging.Log;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.springframework.util.StopWatch;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -31,7 +33,7 @@ import static org.mockito.Mockito.verify;
* @author Dave Syer * @author Dave Syer
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
class StartUpLoggerTests { class StartupInfoLoggerTests {
private final Log log = mock(Log.class); private final Log log = mock(Log.class);
@ -44,4 +46,17 @@ class StartUpLoggerTests {
assertThat(captor.getValue().toString()).startsWith("Starting " + getClass().getSimpleName()); assertThat(captor.getValue().toString()).startsWith("Starting " + getClass().getSimpleName());
} }
@Test
void startedFormat() {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
given(this.log.isInfoEnabled()).willReturn(true);
stopWatch.stop();
new StartupInfoLogger(getClass()).logStarted(this.log, stopWatch);
ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
verify(this.log).info(captor.capture());
assertThat(captor.getValue().toString()).matches("Started " + getClass().getSimpleName()
+ " in \\d+\\.\\d{1,3} seconds \\(JVM running for \\d+\\.\\d{1,3}\\)");
}
} }