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
1f80079c
Commit
1f80079c
authored
Mar 20, 2018
by
Alen Turkovic
Committed by
Stephane Nicoll
Mar 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Redis Sentinel database support
See gh-12556
parent
7b24941d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
RedisConnectionConfiguration.java
...utoconfigure/data/redis/RedisConnectionConfiguration.java
+2
-0
RedisAutoConfigurationTests.java
...autoconfigure/data/redis/RedisAutoConfigurationTests.java
+15
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java
View file @
1f80079c
...
...
@@ -35,6 +35,7 @@ import org.springframework.util.StringUtils;
*
* @author Mark Paluch
* @author Stephane Nicoll
* @author Alen Turkovic
*/
abstract
class
RedisConnectionConfiguration
{
...
...
@@ -81,6 +82,7 @@ abstract class RedisConnectionConfiguration {
if
(
this
.
properties
.
getPassword
()
!=
null
)
{
config
.
setPassword
(
RedisPassword
.
of
(
this
.
properties
.
getPassword
()));
}
config
.
setDatabase
(
this
.
properties
.
getDatabase
());
return
config
;
}
return
null
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
View file @
1f80079c
...
...
@@ -49,6 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Marco Aust
* @author Mark Paluch
* @author Stephane Nicoll
* @author Alen Turkovic
*/
public
class
RedisAutoConfigurationTests
{
...
...
@@ -191,6 +192,20 @@ public class RedisAutoConfigurationTests {
.
isTrue
());
}
@Test
public
void
testRedisConfigurationWithSentinelAndDatabase
()
{
this
.
contextRunner
.
withPropertyValues
(
"spring.redis.database:1"
,
"spring.redis.sentinel.master:mymaster"
,
"spring.redis.sentinel.nodes:127.0.0.1:26379, 127.0.0.1:26380"
)
.
run
((
context
)
->
{
LettuceConnectionFactory
connectionFactory
=
context
.
getBean
(
LettuceConnectionFactory
.
class
);
assertThat
(
connectionFactory
.
getDatabase
()).
isEqualTo
(
1
);
assertThat
(
connectionFactory
.
isRedisSentinelAware
()).
isTrue
();
});
}
@Test
public
void
testRedisConfigurationWithSentinelAndPassword
()
{
this
.
contextRunner
...
...
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