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
9b992af3
Commit
9b992af3
authored
Nov 25, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.2.x' into 2.3.x
Closes gh-24250
parents
c383ab78
47efbd90
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
RedisHealthIndicator.java
...ingframework/boot/actuate/redis/RedisHealthIndicator.java
+1
-1
RedisReactiveHealthIndicator.java
...work/boot/actuate/redis/RedisReactiveHealthIndicator.java
+1
-1
RedisHealthIndicatorTests.java
...amework/boot/actuate/redis/RedisHealthIndicatorTests.java
+3
-3
RedisReactiveHealthIndicatorTests.java
...boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
+3
-3
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java
View file @
9b992af3
...
...
@@ -65,7 +65,7 @@ public class RedisHealthIndicator extends AbstractHealthIndicator {
.
withDetail
(
"slots_fail"
,
clusterInfo
.
getSlotsFail
());
}
else
{
String
version
=
connection
.
info
().
getProperty
(
REDIS_VERSION_PROPERTY
);
String
version
=
connection
.
info
(
"server"
).
getProperty
(
REDIS_VERSION_PROPERTY
);
builder
.
up
().
withDetail
(
"version"
,
version
);
}
}
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicator.java
View file @
9b992af3
...
...
@@ -55,7 +55,7 @@ public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicato
private
Mono
<
Health
>
doHealthCheck
(
Health
.
Builder
builder
,
ReactiveRedisConnection
connection
)
{
boolean
isClusterConnection
=
connection
instanceof
ReactiveRedisClusterConnection
;
return
connection
.
serverCommands
().
info
().
map
((
info
)
->
up
(
builder
,
info
,
isClusterConnection
))
return
connection
.
serverCommands
().
info
(
"server"
).
map
((
info
)
->
up
(
builder
,
info
,
isClusterConnection
))
.
onErrorResume
((
ex
)
->
Mono
.
just
(
down
(
builder
,
ex
)))
.
flatMap
((
health
)
->
connection
.
closeLater
().
thenReturn
(
health
));
}
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisHealthIndicatorTests.java
View file @
9b992af3
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -51,7 +51,7 @@ class RedisHealthIndicatorTests {
Properties
info
=
new
Properties
();
info
.
put
(
"redis_version"
,
"2.8.9"
);
RedisConnection
redisConnection
=
mock
(
RedisConnection
.
class
);
given
(
redisConnection
.
info
()).
willReturn
(
info
);
given
(
redisConnection
.
info
(
"server"
)).
willReturn
(
info
);
RedisHealthIndicator
healthIndicator
=
createHealthIndicator
(
redisConnection
);
Health
health
=
healthIndicator
.
health
();
assertThat
(
health
.
getStatus
()).
isEqualTo
(
Status
.
UP
);
...
...
@@ -61,7 +61,7 @@ class RedisHealthIndicatorTests {
@Test
void
redisIsDown
()
{
RedisConnection
redisConnection
=
mock
(
RedisConnection
.
class
);
given
(
redisConnection
.
info
()).
willThrow
(
new
RedisConnectionFailureException
(
"Connection failed"
));
given
(
redisConnection
.
info
(
"server"
)).
willThrow
(
new
RedisConnectionFailureException
(
"Connection failed"
));
RedisHealthIndicator
healthIndicator
=
createHealthIndicator
(
redisConnection
);
Health
health
=
healthIndicator
.
health
();
assertThat
(
health
.
getStatus
()).
isEqualTo
(
Status
.
DOWN
);
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
View file @
9b992af3
...
...
@@ -55,7 +55,7 @@ class RedisReactiveHealthIndicatorTests {
ReactiveRedisConnection
redisConnection
=
mock
(
ReactiveRedisConnection
.
class
);
given
(
redisConnection
.
closeLater
()).
willReturn
(
Mono
.
empty
());
ReactiveServerCommands
commands
=
mock
(
ReactiveServerCommands
.
class
);
given
(
commands
.
info
()).
willReturn
(
Mono
.
just
(
info
));
given
(
commands
.
info
(
"server"
)).
willReturn
(
Mono
.
just
(
info
));
RedisReactiveHealthIndicator
healthIndicator
=
createHealthIndicator
(
redisConnection
,
commands
);
Mono
<
Health
>
health
=
healthIndicator
.
health
();
StepVerifier
.
create
(
health
).
consumeNextWith
((
h
)
->
{
...
...
@@ -73,7 +73,7 @@ class RedisReactiveHealthIndicatorTests {
ReactiveRedisConnection
redisConnection
=
mock
(
ReactiveRedisClusterConnection
.
class
);
given
(
redisConnection
.
closeLater
()).
willReturn
(
Mono
.
empty
());
ReactiveClusterServerCommands
commands
=
mock
(
ReactiveClusterServerCommands
.
class
);
given
(
commands
.
info
()).
willReturn
(
Mono
.
just
(
info
));
given
(
commands
.
info
(
"server"
)).
willReturn
(
Mono
.
just
(
info
));
RedisReactiveHealthIndicator
healthIndicator
=
createHealthIndicator
(
redisConnection
,
commands
);
Mono
<
Health
>
health
=
healthIndicator
.
health
();
StepVerifier
.
create
(
health
).
consumeNextWith
((
h
)
->
{
...
...
@@ -87,7 +87,7 @@ class RedisReactiveHealthIndicatorTests {
@Test
void
redisCommandIsDown
()
{
ReactiveServerCommands
commands
=
mock
(
ReactiveServerCommands
.
class
);
given
(
commands
.
info
()).
willReturn
(
Mono
.
error
(
new
RedisConnectionFailureException
(
"Connection failed"
)));
given
(
commands
.
info
(
"server"
)).
willReturn
(
Mono
.
error
(
new
RedisConnectionFailureException
(
"Connection failed"
)));
ReactiveRedisConnection
redisConnection
=
mock
(
ReactiveRedisConnection
.
class
);
given
(
redisConnection
.
closeLater
()).
willReturn
(
Mono
.
empty
());
RedisReactiveHealthIndicator
healthIndicator
=
createHealthIndicator
(
redisConnection
,
commands
);
...
...
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