Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit12b63b3

Browse files
bug#45281 [Cache] Fix connecting to Redis via a socket file (alebedev80)
This PR was merged into the 4.4 branch.Discussion----------[Cache] Fix connecting to Redis via a socket file| Q | A| ------------- | ---| Branch? | 4.4| Bug fix? | yes| New feature? | no| Deprecations? | no| Tickets |#45277| License | MIT| Doc PR |In the [commit](99b4885) was done follow changes in Traits/RedisTrait.php(188)Old code:```$port = $hosts[0]['port'] ?? null;```New code:```$port = $hosts[0]['port'] ?? 6379;```With DSN "redis:///var/run/redis/redis.sock" raise an error:```Redis connection "redis:///var/run/redis/redis.sock?dbindex=5" failed: php_network_getaddresses: getaddrinfo failed: Name or service not known```Because phpredis doesn't allow socket connections with a port```(new Redis)->connect('/var/run/redis/redis.sock', 6379);```**Error**```PHP Warning: Redis::connect(): php_network_getaddresses: getaddrinfo failed: Name or service not known in /root/test_redis.php on line 5PHP Fatal error: Uncaught RedisException: php_network_getaddresses: getaddrinfo failed: Name or service not known in /root/test_redis.php:5Stack trace:#0 /root/test_redis.php(5): Redis->connect()#1 {main} thrown in /root/test_redis.php on line 5```I added additional validation of connection type (by host or socket). Also I fixed condition when RedisSentinel connection call as it supports connections by host only.Commits-------214fdd1 [Cache] Fix connecting to Redis via a socket file
2 parents1b695a9 +214fdd1 commit12b63b3

File tree

22 files changed

+64
-35
lines changed

22 files changed

+64
-35
lines changed

‎.github/workflows/integration-tests.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
redis:
3434
image:redis:6.0.0
3535
ports:
36-
-6379:6379
36+
-16379:6379
3737
redis-cluster:
3838
image:grokzen/redis-cluster:5.0.4
3939
ports:
@@ -67,6 +67,19 @@ jobs:
6767
-name:Checkout
6868
uses:actions/checkout@v2
6969

70+
-name:Install system dependencies
71+
run:|
72+
echo "::group::apt-get update"
73+
sudo apt-get update
74+
echo "::endgroup::"
75+
76+
echo "::group::install tools & libraries"
77+
sudo apt-get install redis-server
78+
sudo -- sh -c 'echo unixsocket /var/run/redis/redis-server.sock >> /etc/redis/redis.conf'
79+
sudo -- sh -c 'echo unixsocketperm 777 >> /etc/redis/redis.conf'
80+
sudo service redis-server restart
81+
echo "::endgroup::"
82+
7083
-name:Setup PHP
7184
uses:shivammathur/setup-php@v2
7285
with:
@@ -99,6 +112,7 @@ jobs:
99112
-name:Run tests
100113
run:./phpunit --group integration -v
101114
env:
115+
REDIS_HOST:'localhost:16379'
102116
REDIS_CLUSTER_HOSTS:'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
103117
REDIS_SENTINEL_HOSTS:'localhost:26379'
104118
REDIS_SENTINEL_SERVICE:redis_sentinel

‎phpunit.xml.dist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<envname="LDAP_HOST"value="localhost" />
1919
<envname="LDAP_PORT"value="3389" />
2020
<envname="REDIS_HOST"value="localhost" />
21+
<envname="REDIS_SOCKET"value="/var/run/redis/redis-server.sock" />
2122
<envname="MESSENGER_REDIS_DSN"value="redis://localhost/messages" />
2223
<envname="MEMCACHED_HOST"value="localhost" />
2324
<envname="MONGODB_HOST"value="localhost" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected static function createKernel(array $options = []): KernelInterface
121121
privatefunctionskipIfRedisUnavailable()
122122
{
123123
try {
124-
(new \Redis())->connect(getenv('REDIS_HOST'));
124+
(new \Redis())->connect(...explode(':',getenv('REDIS_HOST')));
125125
}catch (\Exception$e) {
126126
self::markTestSkipped($e->getMessage());
127127
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ services:
88
cache.test_redis_connection:
99
public:false
1010
class:Redis
11-
calls:
12-
-[connect, ['%env(REDIS_HOST)%']]
11+
factory:['Symfony\Component\Cache\Adapter\RedisAdapter', 'createConnection']
12+
arguments:['redis://%env(REDIS_HOST)%']
1313

1414
cache.app:
1515
parent:cache.adapter.redis

‎src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public static function setUpBeforeClass(): void
3636
thrownewSkippedTestSuiteError('Extension redis required.');
3737
}
3838
try {
39-
(new \Redis())->connect(getenv('REDIS_HOST'));
39+
(new \Redis())->connect(...explode(':',getenv('REDIS_HOST')));
4040
}catch (\Exception$e) {
41-
thrownewSkippedTestSuiteError($e->getMessage());
41+
thrownewSkippedTestSuiteError(getenv('REDIS_HOST').':'.$e->getMessage());
4242
}
4343
}
4444

‎src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class PredisAdapterTest extends AbstractRedisAdapterTest
2222
publicstaticfunctionsetUpBeforeClass():void
2323
{
2424
parent::setUpBeforeClass();
25-
self::$redis =new \Predis\Client(['host' =>getenv('REDIS_HOST')], ['prefix' =>'prefix_']);
25+
self::$redis =new \Predis\Client(array_combine(['host','port'],explode(':',getenv('REDIS_HOST')) + [1 =>6379]), ['prefix' =>'prefix_']);
2626
}
2727

2828
publicfunctiontestCreateConnection()
@@ -35,10 +35,11 @@ public function testCreateConnection()
3535
$connection =$redis->getConnection();
3636
$this->assertInstanceOf(StreamConnection::class,$connection);
3737

38+
$redisHost =explode(':',$redisHost);
3839
$params = [
3940
'scheme' =>'tcp',
40-
'host' =>$redisHost,
41-
'port' =>6379,
41+
'host' =>$redisHost[0],
42+
'port' =>(int) ($redisHost[1] ??6379),
4243
'persistent' =>0,
4344
'timeout' =>3,
4445
'read_write_timeout' =>0,

‎src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class PredisClusterAdapterTest extends AbstractRedisAdapterTest
1919
publicstaticfunctionsetUpBeforeClass():void
2020
{
2121
parent::setUpBeforeClass();
22-
self::$redis =new \Predis\Client([['host' =>getenv('REDIS_HOST')]], ['prefix' =>'prefix_']);
22+
self::$redis =new \Predis\Client(array_combine(['host','port'],explode(':',getenv('REDIS_HOST')) + [1 =>6379]), ['prefix' =>'prefix_']);
2323
}
2424

2525
publicstaticfunctiontearDownAfterClass():void

‎src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,42 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n
4040
return$adapter;
4141
}
4242

43-
publicfunctiontestCreateConnection()
43+
publicfunctiontestCreateHostConnection()
4444
{
4545
$redis = RedisAdapter::createConnection('redis:?host[h1]&host[h2]&host[/foo:]');
4646
$this->assertInstanceOf(\RedisArray::class,$redis);
4747
$this->assertSame(['h1:6379','h2:6379','/foo'],$redis->_hosts());
4848
@$redis =null;// some versions of phpredis connect on destruct, let's silence the warning
4949

50-
$redisHost =getenv('REDIS_HOST');
50+
$this->doTestCreateConnection(getenv('REDIS_HOST'));
51+
}
52+
53+
publicfunctiontestCreateSocketConnection()
54+
{
55+
if (!getenv('REDIS_SOCKET') || !file_exists(getenv('REDIS_SOCKET'))) {
56+
$this->markTestSkipped('Redis socket not found');
57+
}
58+
59+
$this->doTestCreateConnection(getenv('REDIS_SOCKET'));
60+
}
5161

52-
$redis = RedisAdapter::createConnection('redis://'.$redisHost);
62+
privatefunctiondoTestCreateConnection(string$uri)
63+
{
64+
$redis = RedisAdapter::createConnection('redis://'.$uri);
5365
$this->assertInstanceOf(\Redis::class,$redis);
5466
$this->assertTrue($redis->isConnected());
5567
$this->assertSame(0,$redis->getDbNum());
5668

57-
$redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
69+
$redis = RedisAdapter::createConnection('redis://'.$uri.'/2');
5870
$this->assertSame(2,$redis->getDbNum());
5971

60-
$redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' =>3]);
72+
$redis = RedisAdapter::createConnection('redis://'.$uri, ['timeout' =>3]);
6173
$this->assertEquals(3,$redis->getTimeout());
6274

63-
$redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
75+
$redis = RedisAdapter::createConnection('redis://'.$uri.'?timeout=4');
6476
$this->assertEquals(4,$redis->getTimeout());
6577

66-
$redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' =>5]);
78+
$redis = RedisAdapter::createConnection('redis://'.$uri, ['read_timeout' =>5]);
6779
$this->assertEquals(5,$redis->getReadTimeout());
6880
}
6981

‎src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void
3939
thrownewSkippedTestSuiteError('Extension redis required.');
4040
}
4141
try {
42-
(new \Redis())->connect(getenv('REDIS_HOST'));
42+
(new \Redis())->connect(...explode(':',getenv('REDIS_HOST')));
4343
}catch (\Exception$e) {
4444
thrownewSkippedTestSuiteError($e->getMessage());
4545
}

‎src/Symfony/Component/Cache/Traits/RedisTrait.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public static function createConnection($dsn, array $options = [])
185185

186186
$initializer =staticfunction ($redis)use ($connect,$params,$dsn,$auth,$hosts,$tls) {
187187
$host =$hosts[0]['host'] ??$hosts[0]['path'];
188-
$port =$hosts[0]['port'] ??6379;
188+
$port =$hosts[0]['port'] ??0;
189189

190190
if (isset($hosts[0]['host']) &&$tls) {
191191
$host ='tls://'.$host;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp