projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Sync libtest.
[awesomized/libmemcached]
/
libtest
/
server_container.cc
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 5be04f98eb715c08dcc28599060a9f54fa1d520b..d406c16e497a15591739a58977c5d24bb9d7f665 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-82,7
+82,7
@@
bool server_startup_st::shutdown(uint32_t number_of_host)
{
Server* tmp= servers[number_of_host];
{
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
{
{ }
else
{
@@
-102,11
+102,24
@@
void server_startup_st::shutdown_and_remove()
servers.clear();
}
servers.clear();
}
+bool server_startup_st::check() const
+{
+ for (std::vector<Server *>::const_iterator iter= servers.begin(); iter != servers.end(); iter++)
+ {
+ if ((*iter)->check() == false)
+ {
+ return false;
+ }
+ }
+
+ return true;
+}
+
void server_startup_st::shutdown()
{
for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
{
void server_startup_st::shutdown()
{
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);
}
{
Error << "Unable to kill:" << *(*iter);
}
@@
-328,7
+341,7
@@
bool server_startup_st::start_socket_server(const std::string& server_type, cons
/*
We will now cycle the server we have created.
*/
/*
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;
{
Error << "Could not start up server " << *server;
delete server;