bool is_socket_arg) :
_magic(MAGIC_MEMORY),
_is_socket(is_socket_arg),
- _pid(-1),
_port(port_arg),
_hostname(host_arg),
_app(executable, _is_libtool)
bool Server::check()
{
_app.slurp();
- return _app.check();
+ _app.check();
+ return true;
}
bool Server::validate()
bool Server::has_pid() const
{
- return (_pid > 1);
+ return (_app.pid() > 1);
}
bool Server::start()
{
// If we find that we already have a pid then kill it.
- if (has_pid() == false)
+ if (has_pid() == true)
{
fatal_message("has_pid() failed, programer error");
}
}
#endif
- if (args(_app) == false)
+ if (getenv("YATL_VALGRIND_SERVER"))
+ {
+ _app.use_valgrind();
+ }
+ else if (args(_app) == false)
{
Error << "Could not build command()";
return false;
if (wait.successful() == false)
{
- libtest::fatal(LIBYATL_DEFAULT_PARAM,
- "Unable to open pidfile for: %s",
- _running.c_str());
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ "Unable to open pidfile for: %s",
+ _running.c_str());
}
}
{
if (kill_file(pid_file()) == false)
{
- fatal_message("Failed to kill off server after startup occurred, when pinging failed");
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Failed to kill off server after startup occurred, when pinging failed: %s", pid_file().c_str());
}
Error << "Failed to ping(), waited:" << this_wait
<< " server started, having pid_file. exec:" << _running
return false;
}
- // A failing get_pid() at this point is considered an error
- _pid= get_pid(true);
-
return has_pid();
}
{
_running.clear();
_pid_file.clear();
- _pid= -1;
}
-pid_t Server::pid()
+pid_t Server::pid() const
{
- return _pid;
+ return _app.pid();
}
void Server::add_option(const std::string& arg)
int fd;
if ((fd= mkstemp(file_buffer)) == -1)
{
- libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
}
close(fd);
{
// Set a log file if it was requested (and we can)
- if (has_log_file_option())
+ if (false and has_log_file_option())
{
set_log_file();
log_file_option(app, _log_file);
bool Server::kill()
{
- if (check_pid(_app.pid()) and kill_pid(_app.pid())) // If we kill it, reset
+ if (check_pid(_app.pid())) // If we kill it, reset
{
+ _app.murder();
if (broken_pid_file() and pid_file().empty() == false)
{
unlink(pid_file().c_str());