Code Review
/
ric-plt
/
sdl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Sentinel configuration reading
[ric-plt/sdl.git]
/
src
/
redis
/
asyncsentineldatabasediscovery.cpp
diff --git
a/src/redis/asyncsentineldatabasediscovery.cpp
b/src/redis/asyncsentineldatabasediscovery.cpp
index
be51c5e
..
7c06f15
100644
(file)
--- a/
src/redis/asyncsentineldatabasediscovery.cpp
+++ b/
src/redis/asyncsentineldatabasediscovery.cpp
@@
-56,9
+56,13
@@
namespace
}
AsyncSentinelDatabaseDiscovery::AsyncSentinelDatabaseDiscovery(std::shared_ptr<Engine> engine,
}
AsyncSentinelDatabaseDiscovery::AsyncSentinelDatabaseDiscovery(std::shared_ptr<Engine> engine,
- std::shared_ptr<Logger> logger):
+ std::shared_ptr<Logger> logger,
+ const HostAndPort& sentinelAddress,
+ const std::string& sentinelMasterName):
AsyncSentinelDatabaseDiscovery(engine,
logger,
AsyncSentinelDatabaseDiscovery(engine,
logger,
+ sentinelAddress,
+ sentinelMasterName,
::asyncCommandDispatcherCreator,
std::make_shared<redis::ContentsBuilder>(AsyncStorage::SEPARATOR))
{
::asyncCommandDispatcherCreator,
std::make_shared<redis::ContentsBuilder>(AsyncStorage::SEPARATOR))
{
@@
-66,15
+70,17
@@
AsyncSentinelDatabaseDiscovery::AsyncSentinelDatabaseDiscovery(std::shared_ptr<E
AsyncSentinelDatabaseDiscovery::AsyncSentinelDatabaseDiscovery(std::shared_ptr<Engine> engine,
std::shared_ptr<Logger> logger,
AsyncSentinelDatabaseDiscovery::AsyncSentinelDatabaseDiscovery(std::shared_ptr<Engine> engine,
std::shared_ptr<Logger> logger,
+ const HostAndPort& sentinelAddress,
+ const std::string& sentinelMasterName,
const AsyncCommandDispatcherCreator& asyncCommandDispatcherCreator,
std::shared_ptr<redis::ContentsBuilder> contentsBuilder):
engine(engine),
logger(logger),
const AsyncCommandDispatcherCreator& asyncCommandDispatcherCreator,
std::shared_ptr<redis::ContentsBuilder> contentsBuilder):
engine(engine),
logger(logger),
- // @TODO Make configurable.
- databaseInfo(DatabaseInfo({DatabaseConfiguration::Addresses({HostAndPort("dbaas-ha", htons(26379U))}),
+ databaseInfo(DatabaseInfo({DatabaseConfiguration::Addresses({sentinelAddress}),
DatabaseInfo::Type::SINGLE,
boost::none,
DatabaseInfo::Discovery::SENTINEL})),
DatabaseInfo::Type::SINGLE,
boost::none,
DatabaseInfo::Discovery::SENTINEL})),
+ sentinelMasterName(sentinelMasterName),
contentsBuilder(contentsBuilder),
subscribeRetryTimer(*engine),
subscribeRetryTimerDuration(std::chrono::seconds(1)),
contentsBuilder(contentsBuilder),
subscribeRetryTimer(*engine),
subscribeRetryTimerDuration(std::chrono::seconds(1)),
@@
-181,7
+187,7
@@
void AsyncSentinelDatabaseDiscovery::sendMasterInquiry()
std::placeholders::_1,
std::placeholders::_2),
"dummyNamespace", // Not meaningful for Sentinel
std::placeholders::_1,
std::placeholders::_2),
"dummyNamespace", // Not meaningful for Sentinel
- contentsBuilder->build("SENTINEL", "get-master-addr-by-name",
"mymaster")); //@TODO Make master name configurable
+ contentsBuilder->build("SENTINEL", "get-master-addr-by-name",
sentinelMasterName));
}
void AsyncSentinelDatabaseDiscovery::masterInquiryAck(const std::error_code& error,
}
void AsyncSentinelDatabaseDiscovery::masterInquiryAck(const std::error_code& error,