X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=99a9eeb960eb0614f90838bd90c02084e598a5a0;hb=556d9cca3738f2dcecbe0cda93ba9dd89d1a7a31;hp=55713d45ced450d831bb71d971c98b6371156b02;hpb=7ba11a92a63df071ee3f848c980c8459dc184ebc;p=awesomized%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index 55713d45..99a9eeb9 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -25,12 +25,14 @@ #include #include +#include #include #include #include #include #include +#include // trim from end static inline std::string &rtrim(std::string &s) @@ -81,7 +83,6 @@ Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) : _magic(MAGIC_MEMORY), _is_socket(is_socket_arg), - _pid(-1), _port(port_arg), _hostname(host_arg), _app(executable, _is_libtool) @@ -90,22 +91,13 @@ Server::Server(const std::string& host_arg, const in_port_t port_arg, Server::~Server() { - if (has_pid() and not kill(_pid)) - { - Error << "Unable to kill:" << *this; - } - - Application::error_t ret; - if (Application::SUCCESS != (ret= _app.wait())) - { - Error << "Application::wait() " << _running << " " << ret << ": " << _app.stderr_result(); - } } bool Server::check() { _app.slurp(); - return _app.check(); + _app.check(); + return true; } bool Server::validate() @@ -119,13 +111,12 @@ bool Server::cycle() uint32_t limit= 3; // Try to ping, and kill the server #limit number of times - pid_t current_pid; while (--limit and - is_pid_valid(current_pid= get_pid())) + is_pid_valid(_app.pid())) { - if (kill(current_pid)) + if (kill()) { - Log << "Killed existing server," << *this << " with pid:" << current_pid; + Log << "Killed existing server," << *this; dream(0, 50000); continue; } @@ -134,7 +125,7 @@ bool Server::cycle() // For whatever reason we could not kill it, and we reached limit if (limit == 0) { - Error << "Reached limit, could not kill server pid:" << current_pid; + Error << "Reached limit, could not kill server"; return false; } @@ -148,16 +139,16 @@ bool Server::wait_for_pidfile() const return wait.successful(); } +bool Server::has_pid() const +{ + return (_app.pid() > 1); +} + + bool Server::start() { // If we find that we already have a pid then kill it. - if (has_pid() and kill(_pid) == false) - { - Error << "Could not kill() existing server during start() pid:" << _pid; - return false; - } - - if (has_pid() == false) + if (has_pid() == true) { fatal_message("has_pid() failed, programer error"); } @@ -170,6 +161,15 @@ bool Server::start() } #endif + if (getenv("YATL_PTRCHECK_SERVER")) + { + _app.use_ptrcheck(); + } + else if (getenv("YATL_VALGRIND_SERVER")) + { + _app.use_valgrind(); + } + if (args(_app) == false) { Error << "Could not build command()"; @@ -189,19 +189,33 @@ bool Server::start() dream(5, 50000); } - if (pid_file().empty() == false) + size_t repeat= 5; + _app.slurp(); + while (--repeat) { - Wait wait(pid_file(), 8); - - if (wait.successful() == false) + if (pid_file().empty() == false) { - libtest::fatal(LIBYATL_DEFAULT_PARAM, - "Unable to open pidfile for: %s", - _running.c_str()); + Wait wait(pid_file(), 8); + + if (wait.successful() == false) + { + if (_app.check()) + { + continue; + } + + char buf[PATH_MAX]; + char *getcwd_buf= getcwd(buf, sizeof(buf)); + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, + "Unable to open pidfile in %s for: %s stderr:%s", + getcwd_buf ? getcwd_buf : "", + _running.c_str(), + _app.stderr_c_str()); + } } } - uint32_t this_wait; + uint32_t this_wait= 0; bool pinged= false; { uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow) @@ -227,27 +241,35 @@ bool Server::start() if (pinged == false) { // If we happen to have a pid file, lets try to kill it - if (pid_file().empty() == false) + if ((pid_file().empty() == false) and (access(pid_file().c_str(), R_OK) == 0)) { + _app.slurp(); 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, waited: %u after startup occurred, when pinging failed: %s stderr:%s", + this_wait, + pid_file().c_str(), + _app.stderr_c_str()); } - Error << "Failed to ping(), waited:" << this_wait - << " server started, having pid_file. exec:" << _running - << " error:" << _app.stderr_result(); + + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, + "Failed to ping(), waited: %u server started, having pid_file. exec: %s stderr:%s", + this_wait, _running.c_str(), + _app.stderr_c_str()); } else { - Error << "Failed to ping() server started. exec:" << _running; + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, + "Failed to ping(), waited: %u server started. exec: %s stderr:%s", + this_wait, + _running.c_str(), + _app.stderr_c_str()); } _running.clear(); return false; } - // A failing get_pid() at this point is considered an error - _pid= get_pid(true); - return has_pid(); } @@ -255,12 +277,11 @@ void Server::reset_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) @@ -318,8 +339,7 @@ bool Server::set_pid_file() int fd; if ((fd= mkstemp(file_buffer)) == -1) { - perror(file_buffer); - return false; + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); } close(fd); unlink(file_buffer); @@ -338,7 +358,7 @@ bool Server::set_log_file() 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); @@ -351,7 +371,7 @@ bool Server::args(Application& app) { // 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); @@ -402,10 +422,11 @@ bool Server::args(Application& app) return true; } -bool Server::kill(pid_t pid_arg) +bool Server::kill() { - if (check_pid(pid_arg) and kill_pid(pid_arg)) // 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());