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

Merge branch 'disk'

This commit is contained in:
Andy Wilkinson 2015-03-30 13:42:13 +01:00
parent 96f390a5a5 ee3521b6a2
commit cb4cdf4d9a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.actuate.health; package org.springframework.boot.actuate.health;
import java.io.File;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -45,7 +47,8 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator {
@Override @Override
protected void doHealthCheck(Health.Builder builder) throws Exception { protected void doHealthCheck(Health.Builder builder) throws Exception {
long diskFreeInBytes = this.properties.getPath().getFreeSpace(); File path = this.properties.getPath();
long diskFreeInBytes = path.getFreeSpace();
if (diskFreeInBytes >= this.properties.getThreshold()) { if (diskFreeInBytes >= this.properties.getThreshold()) {
builder.up(); builder.up();
} }
@ -55,7 +58,8 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator {
this.properties.getThreshold())); this.properties.getThreshold()));
builder.down(); builder.down();
} }
builder.withDetail("free", diskFreeInBytes).withDetail("threshold", builder.withDetail("total", path.getTotalSpace())
this.properties.getThreshold()); .withDetail("free", diskFreeInBytes)
.withDetail("threshold", this.properties.getThreshold());
} }
} }

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorTests.java
View File

@ -58,19 +58,23 @@ public class DiskSpaceHealthIndicatorTests {
@Test @Test
public void diskSpaceIsUp() throws Exception { public void diskSpaceIsUp() throws Exception {
given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES + 10); given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES + 10);
given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
Health health = this.healthIndicator.health(); Health health = this.healthIndicator.health();
assertEquals(Status.UP, health.getStatus()); assertEquals(Status.UP, health.getStatus());
assertEquals(THRESHOLD_BYTES, health.getDetails().get("threshold")); assertEquals(THRESHOLD_BYTES, health.getDetails().get("threshold"));
assertEquals(THRESHOLD_BYTES + 10, health.getDetails().get("free")); assertEquals(THRESHOLD_BYTES + 10, health.getDetails().get("free"));
assertEquals(THRESHOLD_BYTES * 10, health.getDetails().get("total"));
} }
@Test @Test
public void diskSpaceIsDown() throws Exception { public void diskSpaceIsDown() throws Exception {
given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES - 10); given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES - 10);
given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
Health health = this.healthIndicator.health(); Health health = this.healthIndicator.health();
assertEquals(Status.DOWN, health.getStatus()); assertEquals(Status.DOWN, health.getStatus());
assertEquals(THRESHOLD_BYTES, health.getDetails().get("threshold")); assertEquals(THRESHOLD_BYTES, health.getDetails().get("threshold"));
assertEquals(THRESHOLD_BYTES - 10, health.getDetails().get("free")); assertEquals(THRESHOLD_BYTES - 10, health.getDetails().get("free"));
assertEquals(THRESHOLD_BYTES * 10, health.getDetails().get("total"));
} }
private DiskSpaceHealthIndicatorProperties createProperties(File path, long threshold) { private DiskSpaceHealthIndicatorProperties createProperties(File path, long threshold) {