Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
f9aeb6ae
Commit
f9aeb6ae
authored
May 22, 2014
by
Christian Dupuis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
344fb461
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
56 additions
and
45 deletions
+56
-45
EndpointWebMvcAutoConfiguration.java
...ctuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
+26
-19
HealthMvcEndpointProperties.java
...ot/actuate/autoconfigure/HealthMvcEndpointProperties.java
+1
-1
HealthEndpoint.java
...springframework/boot/actuate/endpoint/HealthEndpoint.java
+2
-1
CompositeHealthIndicator.java
...amework/boot/actuate/health/CompositeHealthIndicator.java
+1
-1
Health.java
.../java/org/springframework/boot/actuate/health/Health.java
+4
-4
HealthAggregator.java
...springframework/boot/actuate/health/HealthAggregator.java
+3
-3
HealthIndicator.java
.../springframework/boot/actuate/health/HealthIndicator.java
+1
-1
MongoHealthIndicator.java
...ngframework/boot/actuate/health/MongoHealthIndicator.java
+1
-1
OrderedHealthAggregator.java
...ramework/boot/actuate/health/OrderedHealthAggregator.java
+6
-4
RabbitHealthIndicator.java
...gframework/boot/actuate/health/RabbitHealthIndicator.java
+1
-1
RedisHealthIndicator.java
...ngframework/boot/actuate/health/RedisHealthIndicator.java
+1
-1
SimpleDataSourceHealthIndicator.java
.../boot/actuate/health/SimpleDataSourceHealthIndicator.java
+5
-3
Status.java
.../java/org/springframework/boot/actuate/health/Status.java
+3
-3
VanillaHealthIndicator.java
...framework/boot/actuate/health/VanillaHealthIndicator.java
+1
-2
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
View file @
f9aeb6ae
...
@@ -75,7 +75,7 @@ import org.springframework.web.servlet.DispatcherServlet;
...
@@ -75,7 +75,7 @@ import org.springframework.web.servlet.DispatcherServlet;
* different port to {@link ServerProperties} a new child context is created, otherwise it
* different port to {@link ServerProperties} a new child context is created, otherwise it
* is assumed that endpoint requests will be mapped and handled via an already registered
* is assumed that endpoint requests will be mapped and handled via an already registered
* {@link DispatcherServlet}.
* {@link DispatcherServlet}.
*
*
* @author Dave Syer
* @author Dave Syer
* @author Phillip Webb
* @author Phillip Webb
* @author Christian Dupuis
* @author Christian Dupuis
...
@@ -84,8 +84,8 @@ import org.springframework.web.servlet.DispatcherServlet;
...
@@ -84,8 +84,8 @@ import org.springframework.web.servlet.DispatcherServlet;
@ConditionalOnClass
({
Servlet
.
class
,
DispatcherServlet
.
class
})
@ConditionalOnClass
({
Servlet
.
class
,
DispatcherServlet
.
class
})
@ConditionalOnWebApplication
@ConditionalOnWebApplication
@AutoConfigureAfter
({
PropertyPlaceholderAutoConfiguration
.
class
,
@AutoConfigureAfter
({
PropertyPlaceholderAutoConfiguration
.
class
,
EmbeddedServletContainerAutoConfiguration
.
class
,
WebMvcAutoConfiguration
.
class
,
EmbeddedServletContainerAutoConfiguration
.
class
,
WebMvcAutoConfiguration
.
class
,
ManagementServerPropertiesAutoConfiguration
.
class
})
ManagementServerPropertiesAutoConfiguration
.
class
})
@EnableConfigurationProperties
(
HealthMvcEndpointProperties
.
class
)
@EnableConfigurationProperties
(
HealthMvcEndpointProperties
.
class
)
public
class
EndpointWebMvcAutoConfiguration
implements
ApplicationContextAware
,
public
class
EndpointWebMvcAutoConfiguration
implements
ApplicationContextAware
,
ApplicationListener
<
ContextRefreshedEvent
>
{
ApplicationListener
<
ContextRefreshedEvent
>
{
...
@@ -109,8 +109,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
...
@@ -109,8 +109,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
@Bean
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean
public
EndpointHandlerMapping
endpointHandlerMapping
()
{
public
EndpointHandlerMapping
endpointHandlerMapping
()
{
EndpointHandlerMapping
mapping
=
new
EndpointHandlerMapping
(
EndpointHandlerMapping
mapping
=
new
EndpointHandlerMapping
(
mvcEndpoints
()
mvcEndpoints
()
.
getEndpoints
());
.
getEndpoints
());
boolean
disabled
=
ManagementServerPort
.
get
(
this
.
applicationContext
)
!=
ManagementServerPort
.
SAME
;
boolean
disabled
=
ManagementServerPort
.
get
(
this
.
applicationContext
)
!=
ManagementServerPort
.
SAME
;
mapping
.
setDisabled
(
disabled
);
mapping
.
setDisabled
(
disabled
);
if
(!
disabled
)
{
if
(!
disabled
)
{
...
@@ -169,7 +169,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
...
@@ -169,7 +169,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
public
HealthMvcEndpoint
healthMvcEndpoint
(
HealthEndpoint
delegate
)
{
public
HealthMvcEndpoint
healthMvcEndpoint
(
HealthEndpoint
delegate
)
{
HealthMvcEndpoint
healthMvcEndpoint
=
new
HealthMvcEndpoint
(
delegate
);
HealthMvcEndpoint
healthMvcEndpoint
=
new
HealthMvcEndpoint
(
delegate
);
if
(
this
.
healthMvcEndpointProperties
.
getMapping
()
!=
null
)
{
if
(
this
.
healthMvcEndpointProperties
.
getMapping
()
!=
null
)
{
healthMvcEndpoint
.
setStatusMapping
(
this
.
healthMvcEndpointProperties
.
getMapping
());
healthMvcEndpoint
.
setStatusMapping
(
this
.
healthMvcEndpointProperties
.
getMapping
());
}
}
return
healthMvcEndpoint
;
return
healthMvcEndpoint
;
}
}
...
@@ -205,25 +206,28 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
...
@@ -205,25 +206,28 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
// Ensure close on the parent also closes the child
// Ensure close on the parent also closes the child
if
(
this
.
applicationContext
instanceof
ConfigurableApplicationContext
)
{
if
(
this
.
applicationContext
instanceof
ConfigurableApplicationContext
)
{
((
ConfigurableApplicationContext
)
this
.
applicationContext
).
addApplicationListener
(
new
ApplicationListener
<
ContextClosedEvent
>()
{
((
ConfigurableApplicationContext
)
this
.
applicationContext
)
.
addApplicationListener
(
new
ApplicationListener
<
ContextClosedEvent
>()
{
@Override
@Override
public
void
onApplicationEvent
(
ContextClosedEvent
event
)
{
public
void
onApplicationEvent
(
ContextClosedEvent
event
)
{
if
(
event
.
getApplicationContext
()
==
EndpointWebMvcAutoConfiguration
.
this
.
applicationContext
)
{
if
(
event
.
getApplicationContext
()
==
EndpointWebMvcAutoConfiguration
.
this
.
applicationContext
)
{
childContext
.
close
();
childContext
.
close
();
}
}
}
}
});
});
}
}
try
{
try
{
childContext
.
refresh
();
childContext
.
refresh
();
}
catch
(
RuntimeException
ex
)
{
}
catch
(
RuntimeException
ex
)
{
// No support currently for deploying a war with management.port=<different>,
// No support currently for deploying a war with management.port=<different>,
// and this is the signature of that happening
// and this is the signature of that happening
if
(
ex
instanceof
EmbeddedServletContainerException
if
(
ex
instanceof
EmbeddedServletContainerException
||
ex
.
getCause
()
instanceof
EmbeddedServletContainerException
)
{
||
ex
.
getCause
()
instanceof
EmbeddedServletContainerException
)
{
logger
.
warn
(
"Could not start embedded container (management endpoints are still available through JMX)"
);
logger
.
warn
(
"Could not start embedded container (management endpoints are still available through JMX)"
);
}
else
{
}
else
{
throw
ex
;
throw
ex
;
}
}
}
}
...
@@ -238,14 +242,17 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
...
@@ -238,14 +242,17 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
ServerProperties
serverProperties
;
ServerProperties
serverProperties
;
try
{
try
{
serverProperties
=
beanFactory
.
getBean
(
ServerProperties
.
class
);
serverProperties
=
beanFactory
.
getBean
(
ServerProperties
.
class
);
}
catch
(
NoSuchBeanDefinitionException
ex
)
{
}
catch
(
NoSuchBeanDefinitionException
ex
)
{
serverProperties
=
new
ServerProperties
();
serverProperties
=
new
ServerProperties
();
}
}
ManagementServerProperties
managementServerProperties
;
ManagementServerProperties
managementServerProperties
;
try
{
try
{
managementServerProperties
=
beanFactory
.
getBean
(
ManagementServerProperties
.
class
);
managementServerProperties
=
beanFactory
}
catch
(
NoSuchBeanDefinitionException
ex
)
{
.
getBean
(
ManagementServerProperties
.
class
);
}
catch
(
NoSuchBeanDefinitionException
ex
)
{
managementServerProperties
=
new
ManagementServerProperties
();
managementServerProperties
=
new
ManagementServerProperties
();
}
}
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointProperties.java
View file @
f9aeb6ae
...
@@ -25,7 +25,7 @@ import org.springframework.http.HttpStatus;
...
@@ -25,7 +25,7 @@ import org.springframework.http.HttpStatus;
/**
/**
* Configuration properties for the {@link HealthMvcEndpoint}.
* Configuration properties for the {@link HealthMvcEndpoint}.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java
View file @
f9aeb6ae
...
@@ -48,7 +48,8 @@ public class HealthEndpoint extends AbstractEndpoint<Health> {
...
@@ -48,7 +48,8 @@ public class HealthEndpoint extends AbstractEndpoint<Health> {
if
(
healthIndicators
.
size
()
==
1
)
{
if
(
healthIndicators
.
size
()
==
1
)
{
this
.
healthIndicator
=
healthIndicators
.
values
().
iterator
().
next
();
this
.
healthIndicator
=
healthIndicators
.
values
().
iterator
().
next
();
}
else
{
}
else
{
CompositeHealthIndicator
healthIndicator
=
new
CompositeHealthIndicator
(
CompositeHealthIndicator
healthIndicator
=
new
CompositeHealthIndicator
(
healthAggregator
);
healthAggregator
);
for
(
Map
.
Entry
<
String
,
HealthIndicator
>
h
:
healthIndicators
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
HealthIndicator
>
h
:
healthIndicators
.
entrySet
())
{
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java
View file @
f9aeb6ae
...
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
...
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
/**
/**
* {@link HealthIndicator} that returns health indications from all registered delegates.
* {@link HealthIndicator} that returns health indications from all registered delegates.
*
*
* @author Tyler J. Frederick
* @author Tyler J. Frederick
* @author Phillip Webb
* @author Phillip Webb
* @author Christian Dupuis
* @author Christian Dupuis
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java
View file @
f9aeb6ae
...
@@ -31,15 +31,15 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
...
@@ -31,15 +31,15 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
/**
/**
* Value object used to carry information about the health information of a component or
* Value object used to carry information about the health information of a component or
* subsystem.
* subsystem.
*
*
* <p>
* <p>
* {@link Health} contains a {@link Status} to express the state of a component or
* {@link Health} contains a {@link Status} to express the state of a component or
* subsystem and some additional details to carry some contextual information.
* subsystem and some additional details to carry some contextual information.
*
*
* <p>
* <p>
* {@link Health} has a fluent API to make it easy to construct instances. Typical usage
* {@link Health} has a fluent API to make it easy to construct instances. Typical usage
* in a {@link HealthIndicator} would be:
* in a {@link HealthIndicator} would be:
*
*
* <code>
* <code>
* Health health = new Health();
* Health health = new Health();
* try {
* try {
...
@@ -52,7 +52,7 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
...
@@ -52,7 +52,7 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
* }
* }
* return health;
* return health;
* </code>
* </code>
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java
View file @
f9aeb6ae
...
@@ -21,18 +21,18 @@ import java.util.Map;
...
@@ -21,18 +21,18 @@ import java.util.Map;
/**
/**
* Strategy interface used by {@link CompositeHealthIndicator} to aggregate {@link Health}
* Strategy interface used by {@link CompositeHealthIndicator} to aggregate {@link Health}
* instances into a final one.
* instances into a final one.
*
*
* <p>
* <p>
* This is especially useful to combine subsystem states expressed through
* This is especially useful to combine subsystem states expressed through
* {@link Health#getStatus()} into one state for the entire system. The default
* {@link Health#getStatus()} into one state for the entire system. The default
* implementation {@link OrderedHealthAggregator} sorts {@link Status} instances based on
* implementation {@link OrderedHealthAggregator} sorts {@link Status} instances based on
* a priority list.
* a priority list.
*
*
* <p>
* <p>
* It is possible to add more complex {@link Status} types to the system. In that case
* It is possible to add more complex {@link Status} types to the system. In that case
* either the {@link OrderedHealthAggregator} needs to be properly configured or users
* either the {@link OrderedHealthAggregator} needs to be properly configured or users
* need to register a custom {@link HealthAggregator} as bean.
* need to register a custom {@link HealthAggregator} as bean.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java
View file @
f9aeb6ae
...
@@ -18,7 +18,7 @@ package org.springframework.boot.actuate.health;
...
@@ -18,7 +18,7 @@ package org.springframework.boot.actuate.health;
/**
/**
* Strategy interface used to provide an indication of application health.
* Strategy interface used to provide an indication of application health.
*
*
* @author Dave Syer
* @author Dave Syer
* @see VanillaHealthIndicator
* @see VanillaHealthIndicator
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java
View file @
f9aeb6ae
...
@@ -24,7 +24,7 @@ import com.mongodb.CommandResult;
...
@@ -24,7 +24,7 @@ import com.mongodb.CommandResult;
/**
/**
* Simple implementation of a {@link HealthIndicator} returning status information for
* Simple implementation of a {@link HealthIndicator} returning status information for
* Mongo data stores.
* Mongo data stores.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
View file @
f9aeb6ae
...
@@ -26,11 +26,11 @@ import java.util.Map;
...
@@ -26,11 +26,11 @@ import java.util.Map;
/**
/**
* Default {@link HealthAggregator} implementation that aggregates {@link Health}
* Default {@link HealthAggregator} implementation that aggregates {@link Health}
* instances and determines the final system state based on a simple ordered list.
* instances and determines the final system state based on a simple ordered list.
*
*
* <p>
* <p>
* If a different order is required or a new {@link Status} type will be used, the order
* If a different order is required or a new {@link Status} type will be used, the order
* can be set by calling {@link #setStatusOrder(List)}.
* can be set by calling {@link #setStatusOrder(List)}.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
@@ -67,8 +67,10 @@ public class OrderedHealthAggregator implements HealthAggregator {
...
@@ -67,8 +67,10 @@ public class OrderedHealthAggregator implements HealthAggregator {
@Override
@Override
public
int
compare
(
Status
s1
,
Status
s2
)
{
public
int
compare
(
Status
s1
,
Status
s2
)
{
return
Integer
.
valueOf
(
return
Integer
.
valueOf
(
OrderedHealthAggregator
.
this
.
statusOrder
.
indexOf
(
s1
.
getCode
())).
compareTo
(
OrderedHealthAggregator
.
this
.
statusOrder
.
indexOf
(
s1
.
getCode
()))
Integer
.
valueOf
(
OrderedHealthAggregator
.
this
.
statusOrder
.
indexOf
(
s2
.
getCode
())));
.
compareTo
(
Integer
.
valueOf
(
OrderedHealthAggregator
.
this
.
statusOrder
.
indexOf
(
s2
.
getCode
())));
}
}
});
});
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RabbitHealthIndicator.java
View file @
f9aeb6ae
...
@@ -27,7 +27,7 @@ import com.rabbitmq.client.Channel;
...
@@ -27,7 +27,7 @@ import com.rabbitmq.client.Channel;
/**
/**
* Simple implementation of a {@link HealthIndicator} returning status information for the
* Simple implementation of a {@link HealthIndicator} returning status information for the
* RabbitMQ messaging system.
* RabbitMQ messaging system.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RedisHealthIndicator.java
View file @
f9aeb6ae
...
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
...
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
/**
/**
* Simple implementation of a {@link HealthIndicator} returning status information for
* Simple implementation of a {@link HealthIndicator} returning status information for
* Redis data stores.
* Redis data stores.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java
View file @
f9aeb6ae
...
@@ -31,7 +31,7 @@ import org.springframework.util.StringUtils;
...
@@ -31,7 +31,7 @@ import org.springframework.util.StringUtils;
/**
/**
* Simple implementation of {@link HealthIndicator} that returns a status and also
* Simple implementation of {@link HealthIndicator} that returns a status and also
* attempts a simple database test.
* attempts a simple database test.
*
*
* @author Dave Syer
* @author Dave Syer
* @author Christian Dupuis
* @author Christian Dupuis
*/
*/
...
@@ -88,7 +88,8 @@ public class SimpleDataSourceHealthIndicator implements HealthIndicator {
...
@@ -88,7 +88,8 @@ public class SimpleDataSourceHealthIndicator implements HealthIndicator {
}
}
});
});
health
.
withDetail
(
"database"
,
product
);
health
.
withDetail
(
"database"
,
product
);
}
catch
(
DataAccessException
ex
)
{
}
catch
(
DataAccessException
ex
)
{
health
.
down
().
withException
(
ex
);
health
.
down
().
withException
(
ex
);
}
}
String
query
=
detectQuery
(
product
);
String
query
=
detectQuery
(
product
);
...
@@ -96,7 +97,8 @@ public class SimpleDataSourceHealthIndicator implements HealthIndicator {
...
@@ -96,7 +97,8 @@ public class SimpleDataSourceHealthIndicator implements HealthIndicator {
try
{
try
{
health
.
withDetail
(
"hello"
,
health
.
withDetail
(
"hello"
,
this
.
jdbcTemplate
.
queryForObject
(
query
,
Object
.
class
));
this
.
jdbcTemplate
.
queryForObject
(
query
,
Object
.
class
));
}
catch
(
Exception
ex
)
{
}
catch
(
Exception
ex
)
{
health
.
down
().
withException
(
ex
);
health
.
down
().
withException
(
ex
);
}
}
}
}
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java
View file @
f9aeb6ae
...
@@ -25,14 +25,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
...
@@ -25,14 +25,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
/**
* Value object to express state of a component or subsystem.
* Value object to express state of a component or subsystem.
*
*
* <p>
* <p>
* Status provides convenient constants for commonly used states like {@link #UP},
* Status provides convenient constants for commonly used states like {@link #UP},
* {@link #DOWN} or {@link #OUT_OF_SERVICE}.
* {@link #DOWN} or {@link #OUT_OF_SERVICE}.
*
*
* <p>
* <p>
* Custom states can also be created and used throughout the Spring Boot Health subsystem.
* Custom states can also be created and used throughout the Spring Boot Health subsystem.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
* @since 1.1.0
* @since 1.1.0
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java
View file @
f9aeb6ae
...
@@ -16,10 +16,9 @@
...
@@ -16,10 +16,9 @@
package
org
.
springframework
.
boot
.
actuate
.
health
;
package
org
.
springframework
.
boot
.
actuate
.
health
;
/**
/**
* Default implementation of {@link HealthIndicator} that simply returns {@literal "ok"}.
* Default implementation of {@link HealthIndicator} that simply returns {@literal "ok"}.
*
*
* @author Dave Syer
* @author Dave Syer
* @author Christian Dupuis
* @author Christian Dupuis
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment