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);
}
libtest::Server* server_startup_st::create(const std::string& server_type, in_port_t try_port, const bool is_socket)
}
else if (server_type.compare("drizzled") == 0)
{
- if (DRIZZLED_BINARY)
+ if (has_drizzled())
{
- if (HAVE_LIBDRIZZLE)
+ if (has_libdrizzle())
{
server= build_drizzled("localhost", try_port);
}
}
else if (server_type.compare("blobslap_worker") == 0)
{
- if (GEARMAND_BINARY)
+ if (has_gearmand())
{
+#ifdef GEARMAND_BLOBSLAP_WORKER
if (GEARMAND_BLOBSLAP_WORKER)
{
if (HAVE_LIBGEARMAN)
server= build_blobslap_worker(try_port);
}
}
+#endif // GEARMAND_BLOBSLAP_WORKER
}
}
else if (server_type.compare("memcached") == 0)
{
- if (HAVE_MEMCACHED_BINARY)
+ if (has_memcached())
{
server= build_memcached("localhost", try_port);
}
bool server_startup_st::_start_server(const bool is_socket,
const std::string& server_type,
in_port_t try_port,
- int argc, const char *argv[],
- const bool opt_startup_message)
+ const char *argv[])
{
try {
ServerPtr server(create(server_type, try_port, is_socket));
return false;
}
- server->build(argc, argv);
+ server->init(argv);
#if 0
if (false)
}
else
{
- if (opt_startup_message)
{
-#if defined(DEBUG)
+#ifdef DEBUG
if (DEBUG)
{
Outn();
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)
{
return false;
}
}
- catch (libtest::__test_result& err)
+ catch (const libtest::__test_result& err)
{
stream::cerr(err.file(), err.line(), err.func()) << err.what();
return false;
}
- catch (std::exception& err)
+ catch (const std::exception& err)
{
Error << err.what();
return false;
return true;
}
-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)
+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, argc, argv, opt_startup_message);
+ return _start_server(false, server_type, try_port, 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)
+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, argc, argv, opt_startup_message);
+ return _start_server(true, server_type, try_port, argv);
}
std::string server_startup_st::option_string() const