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
e03e1098
Commit
e03e1098
authored
Jul 18, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
ef6139be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
RedisHealthIndicator.java
...ngframework/boot/actuate/health/RedisHealthIndicator.java
+3
-2
JtaAutoConfiguration.java
...t/autoconfigure/transaction/jta/JtaAutoConfiguration.java
+1
-0
HornetQEmbeddedConfigurationFactoryTests.java
...jms/hornetq/HornetQEmbeddedConfigurationFactoryTests.java
+0
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RedisHealthIndicator.java
View file @
e03e1098
...
...
@@ -36,7 +36,9 @@ import org.springframework.util.Assert;
public
class
RedisHealthIndicator
extends
AbstractHealthIndicator
{
private
static
final
String
VERSION
=
"version"
;
private
static
final
String
REDIS_VERSION
=
"redis_version"
;
private
final
RedisConnectionFactory
redisConnectionFactory
;
public
RedisHealthIndicator
(
RedisConnectionFactory
connectionFactory
)
{
...
...
@@ -52,8 +54,7 @@ public class RedisHealthIndicator extends AbstractHealthIndicator {
if
(
connection
instanceof
RedisClusterConnection
)
{
ClusterInfo
clusterInfo
=
((
RedisClusterConnection
)
connection
)
.
clusterGetClusterInfo
();
builder
.
up
()
.
withDetail
(
"cluster_size"
,
clusterInfo
.
getClusterSize
())
builder
.
up
().
withDetail
(
"cluster_size"
,
clusterInfo
.
getClusterSize
())
.
withDetail
(
"slots_up"
,
clusterInfo
.
getSlotsOk
())
.
withDetail
(
"slots_fail"
,
clusterInfo
.
getSlotsFail
());
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java
View file @
e03e1098
...
...
@@ -34,6 +34,7 @@ import org.springframework.context.annotation.Import;
* @author Phillip Webb
* @since 1.2.0
*/
@SuppressWarnings
(
"deprecation"
)
@ConditionalOnClass
(
javax
.
transaction
.
Transaction
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.jta"
,
value
=
"enabled"
,
matchIfMissing
=
true
)
@AutoConfigureBefore
({
XADataSourceAutoConfiguration
.
class
,
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactoryTests.java
View file @
e03e1098
...
...
@@ -29,7 +29,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
*/
@Deprecated
@SuppressWarnings
(
"deprecation"
)
public
class
HornetQEmbeddedConfigurationFactoryTests
{
@Test
...
...
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