{
Server* tmp= servers[number_of_host];
- if (tmp and tmp->has_pid() and not tmp->kill(tmp->pid()))
+ if (tmp and tmp->has_pid() and tmp->kill() == false)
{ }
else
{
servers.clear();
}
-void server_startup_st::shutdown()
+bool server_startup_st::check() const
{
+ bool success= true;
+ for (std::vector<Server *>::const_iterator iter= servers.begin(); iter != servers.end(); iter++)
+ {
+ if ((*iter)->check() == false)
+ {
+ success= false;
+ }
+ }
+
+ return success;
+}
+
+bool server_startup_st::shutdown()
+{
+ bool success= true;
for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
{
- if ((*iter)->has_pid() and not (*iter)->kill((*iter)->pid()))
+ if ((*iter)->has_pid() and (*iter)->kill() == false)
{
Error << "Unable to kill:" << *(*iter);
+ success= false;
}
}
+
+ return success;
}
void server_startup_st::restart()
_magic(MAGIC_MEMORY),
_socket(false),
_sasl(false),
- _count(5),
- udp(0)
+ _count(0),
+ udp(0),
+ _servers_to_run(5)
{ }
server_startup_st::~server_startup_st()
return _magic == MAGIC_MEMORY;
}
-
-bool server_startup_st::is_debug() const
-{
- return bool(getenv("LIBTEST_MANUAL_GDB"));
-}
-
-bool server_startup_st::is_valgrind() const
-{
- return bool(getenv("LIBTEST_MANUAL_VALGRIND"));
-}
-
-bool server_startup_st::is_helgrind() const
+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 bool(getenv("LIBTEST_MANUAL_HELGRIND"));
-}
-
-
-bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[])
-{
- Outn();
if (try_port <= 0)
{
- libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port));
}
libtest::Server *server= NULL;
server->build(argc, argv);
- if (construct.is_debug())
+ if (false)
{
Out << "Pausing for startup, hit return when ready.";
std::string gdb_command= server->base_command();
}
else
{
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ if (opt_startup_message)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
}
construct.push_server(server);
- Outn();
-
return true;
}
/*
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;
server->build(argc, argv);
- if (is_debug())
+ if (false)
{
Out << "Pausing for startup, hit return when ready.";
std::string gdb_command= server->base_command();
#endif
getchar();
}
- else if (not server->start())
+ else if (server->start() == false)
{
Error << "Failed to start " << *server;
delete server;