projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://soup.haus/ Build: jenkins-Libmemcached-472
[awesomized/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index 522120be3e3f6c79081a49687c3cab368d502866..d024d054ab02e4e6d1e284c7a601930f49f8238e 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-124,7
+124,7
@@
Server::Server(const std::string& host_arg, const in_port_t port_arg,
Server::~Server()
{
Server::~Server()
{
-
murder
();
+
kill
();
}
bool Server::check()
}
bool Server::check()
@@
-148,7
+148,7
@@
bool Server::cycle()
while (--limit and
is_pid_valid(_app.pid()))
{
while (--limit and
is_pid_valid(_app.pid()))
{
- if (
murder
())
+ if (
kill
())
{
Log << "Killed existing server," << *this;
dream(0, 50000);
{
Log << "Killed existing server," << *this;
dream(0, 50000);
@@
-173,6
+173,22
@@
bool Server::wait_for_pidfile() const
return wait.successful();
}
return wait.successful();
}
+bool Server::init(const char *argv[])
+{
+ if (argv)
+ {
+ for (const char **ptr= argv; *ptr ; ++ptr)
+ {
+ if (ptr)
+ {
+ add_option(*ptr);
+ }
+ }
+ }
+
+ return build();
+}
+
bool Server::has_pid() const
{
return (_app.pid() > 1);
bool Server::has_pid() const
{
return (_app.pid() > 1);
@@
-498,7
+514,7
@@
bool Server::args(Application& app)
return true;
}
return true;
}
-bool Server::
murder
()
+bool Server::
kill
()
{
if (check_pid(_app.pid())) // If we kill it, reset
{
{
if (check_pid(_app.pid())) // If we kill it, reset
{