_is_socket(is_socket_arg),
_port(port_arg),
_hostname(host_arg),
- _app(executable, _is_libtool)
+ _app(executable, _is_libtool),
+ out_of_ban_killed_(false)
{
}
bool Server::wait_for_pidfile() const
{
- if (has_pid_file())
- {
- Wait wait(pid_file(), 4);
-
- return wait.successful();
- }
+ Wait wait(pid_file(), 4);
- return true;
+ return wait.successful();
}
bool Server::has_pid() const
}
#endif
+ if (port() == LIBTEST_FAIL_PORT)
+ {
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(), "Called failure");
+ }
+
if (getenv("YATL_PTRCHECK_SERVER"))
{
_app.use_ptrcheck();
if (args(_app) == false)
{
- Error << "Could not build command()";
- return false;
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(), "Could not build command()");
}
libtest::release_port(_port);
Application::error_t ret;
if (Application::SUCCESS != (ret= _app.run()))
{
- Error << "Application::run() " << ret;
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(), "Application::run() %s", libtest::Application::toString(ret));
return false;
}
_running= _app.print();
dream(5, 50000);
}
+ size_t repeat= 5;
_app.slurp();
- if (has_pid_file())
+ while (--repeat)
{
- size_t repeat= 5;
- while (--repeat)
+ if (pid_file().empty() == false)
{
- if (pid_file().empty() == false)
- {
- Wait wait(pid_file(), 8);
+ Wait wait(pid_file(), 8);
- if (wait.successful() == false)
+ if (wait.successful() == false)
+ {
+ if (_app.check())
{
- if (_app.check())
- {
- _app.slurp();
- 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());
+ _app.slurp();
+ continue;
}
+
+ char buf[PATH_MAX];
+ char *getcwd_buf= getcwd(buf, sizeof(buf));
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(),
+ "Unable to open pidfile in %s for: %s stderr:%s",
+ getcwd_buf ? getcwd_buf : "",
+ _running.c_str(),
+ _app.stderr_c_str());
}
}
}
uint32_t waited;
uint32_t retry;
- for (waited= 0, retry= 1; ; retry++, waited+= this_wait)
+ for (waited= 0, retry= 4; ; retry++, waited+= this_wait)
{
if ((pinged= ping()) == true)
{
_app.slurp();
if (kill_file(pid_file()) == false)
{
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(),
"Failed to kill off server, waited: %u after startup occurred, when pinging failed: %.*s stderr:%.*s",
this_wait,
int(_running.size()), _running.c_str(),
int(_app.stderr_result_length()), _app.stderr_c_str());
}
-
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
- "Failed native ping(), pid: %d is alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s",
- int(_app.pid()),
- _app.check() ? "true" : "false",
- this_wait,
- int(_running.size()), _running.c_str(),
- int(_app.stderr_result_length()), _app.stderr_c_str());
+ else
+ {
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(),
+ "Failed native ping(), pid: %d was alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s",
+ int(_app.pid()),
+ _app.check() ? "true" : "false",
+ this_wait,
+ int(_running.size()), _running.c_str(),
+ int(_app.stderr_result_length()), _app.stderr_c_str());
+ }
}
else
{
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ throw libtest::start(LIBYATL_DEFAULT_PARAM,
+ hostname(), port(),
"Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s",
int(_app.pid()),
_app.check() ? "true" : "false",
int(_app.stderr_result_length()), _app.stderr_c_str());
}
_running.clear();
+
return false;
}
_options.push_back(std::make_pair(arg, std::string()));
}
-void Server::add_option(const std::string& name, const std::string& value)
+void Server::add_option(const std::string& name_, const std::string& value)
{
- _options.push_back(std::make_pair(name, value));
+ _options.push_back(std::make_pair(name_, value));
}
bool Server::set_socket_file()
}
// Update pid_file
- if (has_pid_file())
{
if (_pid_file.empty() and set_pid_file() == false)
{
port_option(app, _port);
}
- for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++)
+ for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter)
{
if ((*iter).second.empty() == false)
{