File tree Expand file tree Collapse file tree 2 files changed +15
-3
lines changed Expand file tree Collapse file tree 2 files changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ class RedisConnection extends BaseConnection implements ConnectionInterface
65
65
public function __construct (ContainerInterface $ container , Pool $ pool , array $ config )
66
66
{
67
67
parent ::__construct ($ container , $ pool );
68
- $ this ->config = array_replace ($ this ->config , $ config );
68
+ $ this ->config = array_replace_recursive ($ this ->config , $ config );
69
69
70
70
$ this ->reconnect ();
71
71
}
@@ -166,7 +166,7 @@ protected function createRedisCluster()
166
166
try {
167
167
$ seeds = $ this ->config ['cluster ' ]['seeds ' ] ?? [];
168
168
$ name = $ this ->config ['cluster ' ]['name ' ] ?? null ;
169
- $ readTimeout = $ this ->config ['cluster ' ]['read_timeout ' ] ?? null ;
169
+ $ readTimeout = $ this ->config ['cluster ' ]['read_timeout ' ] ?? 0.0 ;
170
170
$ persistent = $ this ->config ['cluster ' ]['persistent ' ] ?? false ;
171
171
$ timeout = $ this ->config ['timeout ' ] ?? null ;
172
172
$ auth = $ this ->config ['auth ' ] ?? null ;
Original file line number Diff line number Diff line change @@ -49,7 +49,9 @@ public function testRedisConnectionConfig()
49
49
'cluster ' => [
50
50
'enable ' => false ,
51
51
'name ' => null ,
52
- 'seeds ' => [],
52
+ 'seeds ' => [
53
+ '127.0.0.1:6379 ' ,
54
+ ],
53
55
'read_timeout ' => 0.0 ,
54
56
'persistent ' => false ,
55
57
],
@@ -128,6 +130,16 @@ private function getRedisPool()
128
130
'heartbeat ' => -1 ,
129
131
'max_idle_time ' => 1 ,
130
132
],
133
+ 'cluster ' => [
134
+ 'enable ' => false ,
135
+ 'name ' => null ,
136
+ 'seeds ' => [
137
+ '127.0.0.1:6379 ' ,
138
+ ],
139
+ ],
140
+ 'sentinel ' => [
141
+ 'enable ' => false ,
142
+ ],
131
143
],
132
144
],
133
145
]));
You can’t perform that action at this time.
0 commit comments