X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=25da72c6ff2e410f420a119959f6c26c60e6f18c;hb=24ce539ecb81145bad8e57e6f9c288adfbd71fac;hp=802514d2759914619da89024747ab2ef4f39a318;hpb=293e7b59e12ff6b95b5463614b09bc0158f14592;p=awesomized%2Flibmemcached diff --git a/libtest/server_container.cc b/libtest/server_container.cc index 802514d2..25da72c6 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -38,7 +38,6 @@ #include "libtest/common.h" -#include #include #include #include @@ -88,7 +87,6 @@ void server_startup_st::push_server(Server *arg) } server_list+= server_config_string; - } Server* server_startup_st::pop_server() @@ -118,10 +116,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) - { - delete *iter; - } + std::for_each(servers.begin(), servers.end(), DeleteFromVector()); servers.clear(); } @@ -158,7 +153,12 @@ void server_startup_st::restart() { for (std::vector::iterator iter= servers.begin(); iter != servers.end(); ++iter) { - (*iter)->start(); + Server *server = *iter; + + if (server->check()) { + server->kill(); + } + server->start(); } } @@ -167,7 +167,6 @@ server_startup_st::server_startup_st() : _magic(MAGIC_MEMORY), _socket(false), _sasl(false), - _count(0), udp(0), _servers_to_run(5) { } @@ -182,89 +181,141 @@ bool server_startup_st::validate() return _magic == MAGIC_MEMORY; } -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) +bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, const char *argv[]) { - return construct.start_server(server_type, try_port, argc, argv, opt_startup_message); + return construct.start_server(server_type, try_port, argv); } -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) +libtest::Server* server_startup_st::create(const std::string& server_type, in_port_t try_port, const bool is_socket) { - if (try_port <= 0) + libtest::Server *server= NULL; + + if (is_socket == false) { - throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port)); + if (try_port <= 0) + { + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port)); + } } - libtest::Server *server= NULL; - try { - if (0) - { } - else if (server_type.compare("gearmand") == 0) + if (is_socket) + { + if (server_type.compare("memcached") == 0) { - if (GEARMAND_BINARY) - { - server= build_gearmand("localhost", try_port); - } + server= build_memcached_socket("localhost", try_port); } - else if (server_type.compare("hostile-gearmand") == 0) + else { - if (GEARMAND_BINARY) - { - server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand"); - } + Error << "Socket is not support for server: " << server_type; + return NULL; } - else if (server_type.compare("drizzled") == 0) + } + else if (server_type.compare("gearmand") == 0) + { + server= build_gearmand("localhost", try_port); + } + else if (server_type.compare("hostile-gearmand") == 0) + { + server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand"); + } + else if (server_type.compare("drizzled") == 0) + { + if (has_drizzled()) { - if (DRIZZLED_BINARY) + if (has_libdrizzle()) { - if (HAVE_LIBDRIZZLE) - { - server= build_drizzled("localhost", try_port); - } + server= build_drizzled("localhost", try_port); } } - else if (server_type.compare("blobslap_worker") == 0) + } + else if (server_type.compare("blobslap_worker") == 0) + { + if (has_gearmand()) { - if (GEARMAND_BINARY) +#ifdef GEARMAND_BLOBSLAP_WORKER + if (GEARMAND_BLOBSLAP_WORKER) { - if (GEARMAND_BLOBSLAP_WORKER) + if (HAVE_LIBGEARMAN) { - if (HAVE_LIBGEARMAN) - { - server= build_blobslap_worker(try_port); - } + server= build_blobslap_worker(try_port); } } +#endif // GEARMAND_BLOBSLAP_WORKER } - else if (server_type.compare("memcached") == 0) + } + else if (server_type.compare("memcached") == 0) + { + if (has_memcached()) { - if (HAVE_MEMCACHED_BINARY) - { - server= build_memcached("localhost", try_port); - } + server= build_memcached("localhost", try_port); } + } - if (server == NULL) - { - throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Launching of an unknown server was attempted: %s", server_type.c_str()); - } + return server; +} + +class ServerPtr { +public: + ServerPtr(libtest::Server* server_): + _server(server_) + { } + + ~ServerPtr() + { + delete _server; } - catch (...) + + void reset() + { + delete _server; + _server= NULL; + } + + libtest::Server* release(libtest::Server* server_= NULL) + { + libtest::Server* tmp= _server; + _server= server_; + return tmp; + } + + libtest::Server* operator->() const { - throw; + return _server; + } + + libtest::Server* operator&() const + { + return _server; } +private: + libtest::Server* _server; +}; + +bool server_startup_st::_start_server(const bool is_socket, + const std::string& server_type, + in_port_t try_port, + const char *argv[]) +{ try { + ServerPtr server(create(server_type, try_port, is_socket)); + + if (&server == NULL) + { + Error << "Could not allocate 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; + Error << "Could not start up server " << &server; return false; } - server->build(argc, argv); + server->init(argv); #if 0 if (false) @@ -278,138 +329,63 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t if (server->start() == false) { - delete server; return false; } else { - if (opt_startup_message) { -#if defined(DEBUG) +#ifdef DEBUG if (DEBUG) { Outn(); Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); - Outn(); } #endif } } + + push_server(server.release()); + + if (is_socket and &server) + { + set_default_socket(server->socket().c_str()); + } } - catch (libtest::disconnected& err) + catch (const libtest::disconnected& err) { if (fatal::is_disabled() == false and try_port != LIBTEST_FAIL_PORT) { stream::cerr(err.file(), err.line(), err.func()) << err.what(); - delete server; return false; } } - catch (...) + catch (const libtest::__test_result& err) { - delete server; - throw; + stream::cerr(err.file(), err.line(), err.func()) << err.what(); + return false; } - - 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[], - const bool opt_startup_message) -{ - (void)try_port; - Outn(); - - Server *server= NULL; - try { - if (0) - { } - else if (server_type.compare("gearmand") == 0) - { - Error << "Socket files are not supported for gearmand yet"; - } - else if (server_type.compare("memcached") == 0) - { - if (MEMCACHED_BINARY) - { - server= build_memcached_socket("localhost", try_port); - } - 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) - { - 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; - } - - server->build(argc, argv); - -#if 0 - 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 - 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 - } - } + catch (const std::exception& err) + { + Error << err.what(); + return false; } catch (...) { - delete server; - throw; + Error << "error occured while creating server: " << server_type; + return false; } - push_server(server); - - set_default_socket(server->socket().c_str()); + return true; +} - Outn(); +bool server_startup_st::start_server(const std::string& server_type, in_port_t try_port, const char *argv[]) +{ + return _start_server(false, server_type, try_port, argv); +} - return true; +bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, const char *argv[]) +{ + return _start_server(true, server_type, try_port, argv); } std::string server_startup_st::option_string() const