bughz/predixy
1
0
Fork 0
mirror of https://github.com/joyieldInc/predixy.git synced 2025-12-24 22:46:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.wait for response when connecting to redis

Browse Source 
2.remove unused code
3.fix sentinel.conf typing
This commit is contained in:
fortrue 2018-03-26 14:59:20 +08:00
parent 4eda710da4
commit 0891036e8c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/sentinel.conf
View File

@ -40,9 +40,9 @@
# ServerRetryTimeout 1 # ServerRetryTimeout 1
# KeepAlive 120 # KeepAlive 120
# Sentinels { # Sentinels {
# + 10.2.2.2 # + 10.2.2.2:7500
# + 10.2.2.3 # + 10.2.2.3:7500
# + 10.2.2.4 # + 10.2.2.4:7500
# } # }
# Group shard001 { # Group shard001 {
# } # }

3
src/ConnectConnectionPool.cpp
View File

@ -53,11 +53,10 @@ ConnectConnection* ConnectConnectionPool::getShareConnection(int db)
c->close(mHandler); c->close(mHandler);
return nullptr; return nullptr;
} }
if (mServ->fail() || c->isConnecting()) { if (mServ->fail()) {
return nullptr; return nullptr;
} }
return c; return c;
return mServ->fail() ? nullptr : c;
} }
ConnectConnection* ConnectConnectionPool::getPrivateConnection(int db) ConnectConnection* ConnectConnectionPool::getPrivateConnection(int db)