projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge build trunk
[m6w6/libmemcached]
/
libtest
/
server_container.cc
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 684303a23934ef09e7a4e62352cc44219fc8a60d..2c31796f3e141c64530df63aabf99b253725e862 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-77,7
+77,6
@@
Server* server_startup_st::pop_server()
bool server_startup_st::shutdown(uint32_t number_of_host)
{
bool server_startup_st::shutdown(uint32_t number_of_host)
{
- assert(servers.size() > number_of_host);
if (servers.size() > number_of_host)
{
Server* tmp= servers[number_of_host];
if (servers.size() > number_of_host)
{
Server* tmp= servers[number_of_host];
@@
-175,32
+174,19
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
{
server= build_gearmand("localhost", try_port);
}
{
server= build_gearmand("localhost", try_port);
}
- else
- {
- Error << "Libgearman was not found";
- }
- }
- else
- {
- Error << "No gearmand binary is available";
}
}
else if (server_type.compare("blobslap_worker") == 0)
{
}
}
else if (server_type.compare("blobslap_worker") == 0)
{
- if (GEARMAND_BINARY
and GEARMAND_BLOBSLAP_WORKER
)
+ if (GEARMAND_BINARY)
{
{
- if (
HAVE_LIBGEARMAN
)
+ if (
GEARMAND_BLOBSLAP_WORKER
)
{
{
- server= build_blobslap_worker(try_port);
+ if (HAVE_LIBGEARMAN)
+ {
+ server= build_blobslap_worker(try_port);
+ }
}
}
- else
- {
- Error << "Libgearman was not found";
- }
- }
- else
- {
- Error << "No gearmand binary is available";
}
}
else if (server_type.compare("memcached-sasl") == 0)
}
}
else if (server_type.compare("memcached-sasl") == 0)
@@
-211,14
+197,6
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
{
server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password());
}
{
server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password());
}
- else
- {
- Error << "Libmemcached was not found";
- }
- }
- else
- {
- Error << "No memcached binary that was compiled with sasl is available";
}
}
else if (server_type.compare("memcached") == 0)
}
}
else if (server_type.compare("memcached") == 0)
@@
-229,19
+207,7
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
{
server= build_memcached("localhost", try_port);
}
{
server= build_memcached("localhost", try_port);
}
- else
- {
- Error << "Libmemcached was not found";
- }
}
}
- else
- {
- Error << "No memcached binary is available";
- }
- }
- else
- {
- Error << "Failed to start " << server_type << ", no support was found to be compiled in for it.";
}
if (server == NULL)
}
if (server == NULL)
@@
-253,7
+219,7
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
/*
We will now cycle the server we have created.
*/
/*
We will now cycle the server we have created.
*/
- if (
not server->cycle()
)
+ if (
server->cycle() == false
)
{
Error << "Could not start up server " << *server;
delete server;
{
Error << "Could not start up server " << *server;
delete server;
@@
-270,7
+236,7
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
Out << "run " << server->args(options);
getchar();
}
Out << "run " << server->args(options);
getchar();
}
- else if (
not server->start()
)
+ else if (
server->start() == false
)
{
Error << "Failed to start " << *server;
delete server;
{
Error << "Failed to start " << *server;
delete server;