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())
{
}
else
{
+ char port_str[NI_MAXSERV];
+ snprintf(port_str, sizeof(port_str), "%u", int(arg->port()));
+
server_config_string+= "--server=";
server_config_string+= arg->hostname();
server_config_string+= ":";
void server_startup_st::clear()
{
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); ++iter)
{
delete *iter;
}
bool server_startup_st::check() const
{
bool success= true;
- for (std::vector<Server *>::const_iterator iter= servers.begin(); iter != servers.end(); iter++)
+ for (std::vector<Server *>::const_iterator iter= servers.begin(); iter != servers.end(); ++iter)
{
if ((*iter)->check() == false)
{
bool server_startup_st::shutdown()
{
bool success= true;
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); ++iter)
{
- if ((*iter)->has_pid() and (*iter)->kill() == false)
+ if ((*iter) and (*iter)->has_pid() and (*iter)->kill() == false)
{
Error << "Unable to kill:" << *(*iter);
success= false;
void server_startup_st::restart()
{
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); ++iter)
{
(*iter)->start();
}
}
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)
+{
+ 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)
{
}
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("drizzled") == 0)
{
- if (HAVE_LIBDRIZZLE)
+ if (DRIZZLED_BINARY)
{
- server= build_drizzled("localhost", try_port);
+ if (HAVE_LIBDRIZZLE)
+ {
+ server= build_drizzled("localhost", try_port);
+ }
}
}
- }
- else if (server_type.compare("blobslap_worker") == 0)
- {
- if (GEARMAND_BINARY)
+ else if (server_type.compare("blobslap_worker") == 0)
{
- if (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 if (server_type.compare("memcached-sasl") == 0)
- {
- if (MEMCACHED_SASL_BINARY)
+ else if (server_type.compare("memcached-sasl") == 0)
{
- if (HAVE_LIBMEMCACHED)
+ if (MEMCACHED_SASL_BINARY)
{
- server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password());
+ if (HAVE_LIBMEMCACHED)
+ {
+ server= build_memcached_sasl("localhost", try_port, username(), password());
+ }
}
}
- }
- 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)
+ else if (server_type.compare("memcached-light") == 0)
{
- if (HAVE_LIBMEMCACHED)
+ if (MEMCACHED_LIGHT_BINARY)
{
- server= build_memcached_light("localhost", try_port);
+ if (HAVE_LIBMEMCACHED)
+ {
+ server= build_memcached_light("localhost", try_port);
+ }
}
}
- }
- if (server == NULL)
- {
- fatal_message("Launching of an unknown server was attempted");
- }
+ if (server == NULL)
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Launching of an unknown server was attempted: %s", server_type.c_str());
+ }
- /*
- 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 (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);
+ Out << "run " << server->args(options);
#endif
- getchar();
+ getchar();
+ }
+ else if (server->start() == false)
+ {
+ delete server;
+ return false;
+ }
+ else
+ {
+ if (opt_startup_message)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
+ }
}
- else if (server->start() == false)
+ catch (...)
{
delete server;
- return false;
- }
- else
- {
- if (opt_startup_message)
- {
- Outn();
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
- Outn();
- }
+ 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)
+ try {
+ if (0)
+ { }
+ else if (server_type.compare("gearmand") == 0)
{
- if (HAVE_LIBMEMCACHED)
+ Error << "Socket files are not supported for gearmand yet";
+ }
+ else if (server_type.compare("memcached-sasl") == 0)
+ {
+ if (MEMCACHED_SASL_BINARY)
{
- server= build_memcached_sasl_socket("localhost", try_port, username(), password());
+ if (HAVE_LIBMEMCACHED)
+ {
+ server= build_memcached_sasl_socket("localhost", try_port, username(), password());
+ }
+ else
+ {
+ Error << "Libmemcached was not found";
+ }
}
else
{
- Error << "Libmemcached was not found";
+ Error << "No memcached binary is available";
}
}
- else
+ else if (server_type.compare("memcached") == 0)
{
- Error << "No memcached binary is available";
- }
- }
- else if (server_type.compare("memcached") == 0)
- {
- if (MEMCACHED_BINARY)
- {
- 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 (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);
+ Out << "run " << server->args(options);
#endif
- getchar();
+ getchar();
+ }
+ else if (server->start() == false)
+ {
+ Error << "Failed to start " << *server;
+ delete server;
+ return false;
+ }
+ else
+ {
+ if (opt_startup_message)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
+ }
}
- 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);
projects / m6w6 / libmemcached / blobdiff