X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libtest%2Fserver_container.cc;h=17dd6d445f849cc834f82e8c2c2292bf218488e7;hb=d64e1daf4508b440e3373340f82db34f267404ea;hp=f658e6ff83e54c9d4537c8f05cff936ba1e59e95;hpb=1be0350e7ae7a566896a9fe52863dcc22433fc8a;p=awesomized%2Flibmemcached diff --git a/libtest/server_container.cc b/libtest/server_container.cc index f658e6ff..17dd6d44 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -34,8 +34,9 @@ * */ -#include -#include +#include "libtest/yatlcon.h" + +#include "libtest/common.h" #include #include @@ -55,13 +56,15 @@ static inline std::string &rtrim(std::string &s) namespace libtest { +Server* server_startup_st::last() +{ + return servers.back(); +} + void server_startup_st::push_server(Server *arg) { servers.push_back(arg); - char port_str[NI_MAXSERV]; - snprintf(port_str, sizeof(port_str), "%u", int(arg->port())); - std::string server_config_string; if (arg->has_socket()) { @@ -73,10 +76,14 @@ void server_startup_st::push_server(Server *arg) } else { + libtest::vchar_t port_str; + port_str.resize(NI_MAXSERV); + snprintf(&port_str[0], port_str.size(), "%u", int(arg->port())); + server_config_string+= "--server="; server_config_string+= arg->hostname(); server_config_string+= ":"; - server_config_string+= port_str; + server_config_string+= &port_str[0]; server_config_string+= " "; } @@ -111,7 +118,7 @@ bool server_startup_st::shutdown(uint32_t host_to_shutdown) void server_startup_st::clear() { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::iterator iter= servers.begin(); iter != servers.end(); ++iter) { delete *iter; } @@ -121,7 +128,7 @@ void server_startup_st::clear() bool server_startup_st::check() const { bool success= true; - for (std::vector::const_iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::const_iterator iter= servers.begin(); iter != servers.end(); ++iter) { if ((*iter)->check() == false) { @@ -135,7 +142,7 @@ bool server_startup_st::check() const bool server_startup_st::shutdown() { bool success= true; - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::iterator iter= servers.begin(); iter != servers.end(); ++iter) { if ((*iter)->has_pid() and (*iter)->kill() == false) { @@ -149,7 +156,7 @@ bool server_startup_st::shutdown() void server_startup_st::restart() { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::iterator iter= servers.begin(); iter != servers.end(); ++iter) { (*iter)->start(); } @@ -176,6 +183,11 @@ bool server_startup_st::validate() } bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message) +{ + return construct.start_server(server_type, try_port, argc, argv, opt_startup_message); +} + +bool server_startup_st::start_server(const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message) { if (try_port <= 0) { @@ -183,209 +195,228 @@ bool server_startup(server_startup_st& construct, const std::string& server_type } libtest::Server *server= NULL; - if (0) - { } - else if (server_type.compare("gearmand") == 0) - { - if (GEARMAND_BINARY) + try { + if (0) + { } + else if (server_type.compare("gearmand") == 0) { - if (HAVE_LIBGEARMAN) + if (GEARMAND_BINARY) { - server= build_gearmand("localhost", try_port); + if (HAVE_LIBGEARMAN) + { + server= build_gearmand("localhost", try_port); + } } } - } - else if (server_type.compare("drizzled") == 0) - { - if (DRIZZLED_BINARY) + else if (server_type.compare("hostile-gearmand") == 0) { - if (HAVE_LIBDRIZZLE) + if (GEARMAND_BINARY) { - server= build_drizzled("localhost", try_port); + if (HAVE_LIBGEARMAN) + { + server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand"); + } } } - } - else if (server_type.compare("blobslap_worker") == 0) - { - if (GEARMAND_BINARY) + else if (server_type.compare("drizzled") == 0) { - if (GEARMAND_BLOBSLAP_WORKER) + if (DRIZZLED_BINARY) { - if (HAVE_LIBGEARMAN) + if (HAVE_LIBDRIZZLE) { - server= build_blobslap_worker(try_port); + server= build_drizzled("localhost", try_port); } } } - } - else if (server_type.compare("memcached-sasl") == 0) - { - if (MEMCACHED_SASL_BINARY) + else if (server_type.compare("blobslap_worker") == 0) { - if (HAVE_LIBMEMCACHED) + if (GEARMAND_BINARY) { - server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password()); + if (GEARMAND_BLOBSLAP_WORKER) + { + if (HAVE_LIBGEARMAN) + { + server= build_blobslap_worker(try_port); + } + } } } - } - else if (server_type.compare("memcached") == 0) - { - if (MEMCACHED_BINARY) + else if (server_type.compare("memcached") == 0) { - if (HAVE_LIBMEMCACHED) + if (HAVE_MEMCACHED_BINARY) { - server= build_memcached("localhost", try_port); + if (HAVE_LIBMEMCACHED) + { + server= build_memcached("localhost", try_port); + } } } - } - else if (server_type.compare("memcached-light") == 0) - { - if (MEMCACHED_LIGHT_BINARY) + + if (server == NULL) { - if (HAVE_LIBMEMCACHED) - { - server= build_memcached_light("localhost", try_port); - } + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Launching of an unknown server was attempted: %s", server_type.c_str()); } } - - if (server == NULL) + catch (...) { - fatal_message("Launching of an unknown server was attempted"); + throw; } - /* - We will now cycle the server we have created. - */ - if (server->cycle() == false) - { - Error << "Could not start up server " << *server; - delete server; - return false; - } + try { + /* + We will now cycle the server we have created. + */ + if (server->cycle() == false) + { + Error << "Could not start up server " << *server; + delete server; + return false; + } - server->build(argc, argv); + server->build(argc, argv); - if (false) - { - Out << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; #if 0 - Out << "run " << server->args(options); + if (false) + { + Out << "Pausing for startup, hit return when ready."; + std::string gdb_command= server->base_command(); + getchar(); + } + else #endif - getchar(); - } - else if (server->start() == false) - { - delete server; - return false; + + if (server->start() == false) + { + delete server; + return false; + } + else + { + if (opt_startup_message) + { +#if defined(DEBUG) + if (DEBUG) + { + Outn(); + Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + Outn(); + } +#endif + } + } } - else + catch (libtest::disconnected& err) { - if (opt_startup_message) + if (fatal::is_disabled() == false and try_port != LIBTEST_FAIL_PORT) { - Outn(); - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); - Outn(); + stream::cerr(err.file(), err.line(), err.func()) << err.what(); + delete server; + return false; } } + catch (...) + { + delete server; + throw; + } - construct.push_server(server); + push_server(server); return true; } -bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]) +bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, + const char *argv[], + const bool opt_startup_message) { (void)try_port; Outn(); Server *server= NULL; - if (0) - { } - else if (server_type.compare("gearmand") == 0) - { - Error << "Socket files are not supported for gearmand yet"; - } - else if (server_type.compare("memcached-sasl") == 0) - { - if (MEMCACHED_SASL_BINARY) - { - if (HAVE_LIBMEMCACHED) - { - server= build_memcached_sasl_socket("localhost", try_port, username(), password()); - } - else - { - Error << "Libmemcached was not found"; - } - } - else + try { + if (0) + { } + else if (server_type.compare("gearmand") == 0) { - Error << "No memcached binary is available"; + Error << "Socket files are not supported for gearmand yet"; } - } - else if (server_type.compare("memcached") == 0) - { - if (MEMCACHED_BINARY) + else if (server_type.compare("memcached") == 0) { - if (HAVE_LIBMEMCACHED) + if (MEMCACHED_BINARY) { - server= build_memcached_socket("localhost", try_port); + if (HAVE_LIBMEMCACHED) + { + server= build_memcached_socket("localhost", try_port); + } + else + { + Error << "Libmemcached was not found"; + } } else { - Error << "Libmemcached was not found"; + Error << "No memcached binary is available"; } } else { - Error << "No memcached binary is available"; + Error << "Failed to start " << server_type << ", no support was found to be compiled in for it."; } - } - else - { - Error << "Failed to start " << server_type << ", no support was found to be compiled in for it."; - } - if (server == NULL) - { - Error << "Failure occured while creating server: " << server_type; - return false; - } + if (server == NULL) + { + Error << "Failure occured while creating server: " << server_type; + return false; + } - /* - We will now cycle the server we have created. - */ - if (server->cycle() == false) - { - Error << "Could not start up server " << *server; - delete server; - return false; - } + /* + We will now cycle the server we have created. + */ + if (server->cycle() == false) + { + Error << "Could not start up server " << *server; + delete server; + return false; + } - server->build(argc, argv); + server->build(argc, argv); - if (false) - { - Out << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; #if 0 - Out << "run " << server->args(options); + if (false) + { + Out << "Pausing for startup, hit return when ready."; + std::string gdb_command= server->base_command(); + std::string options; + Out << "run " << server->args(options); + getchar(); + } + else #endif - getchar(); + if (server->start() == false) + { + Error << "Failed to start " << *server; + delete server; + return false; + } + else + { + if (opt_startup_message) + { +#if defined(DEBUG) + if (DEBUG) + { + Outn(); + Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + Outn(); + } +#endif + } + } } - else if (server->start() == false) + catch (...) { - Error << "Failed to start " << *server; delete server; - return false; - } - else - { - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + throw; } push_server(server);