projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed memcached invoke function.
[awesomized/libmemcached]
/
test
/
lib
/
MemcachedCluster.cpp
diff --git
a/test/lib/MemcachedCluster.cpp
b/test/lib/MemcachedCluster.cpp
index ca41a904d956817054753e25876e0e1fb35ad084..4b1aa2c5989a26f78c46af1487cb5dae3deac25e 100644
(file)
--- a/
test/lib/MemcachedCluster.cpp
+++ b/
test/lib/MemcachedCluster.cpp
@@
-6,13
+6,8
@@
const memcached_st MemcachedCluster::empty_memc{};
void MemcachedCluster::init() {
REQUIRE(cluster.start());
void MemcachedCluster::init() {
REQUIRE(cluster.start());
- Retry cluster_is_listening([this]() {
- return cluster.isListening();
- });
- while (!cluster_is_listening()) {
- cluster.stop();
- cluster.wait();
- cluster.start();
+ while (!cluster.ensureListening()) {
+ cluster.restart();
}
if (auto br = getenv_else("MEMCACHED_BREAK", "0")) {
}
if (auto br = getenv_else("MEMCACHED_BREAK", "0")) {
@@
-148,6
+143,6
@@
void MemcachedCluster::enableReplication() {
void MemcachedCluster::killOneServer() const {
const auto &servers = cluster.getServers();
void MemcachedCluster::killOneServer() const {
const auto &servers = cluster.getServers();
- const auto &victim = servers[random_num(
0UL
, servers.size() - 1)];
+ const auto &victim = servers[random_num(
(size_t)0
, servers.size() - 1)];
::kill(victim.getPid(), SIGKILL);
}
::kill(victim.getPid(), SIGKILL);
}