projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cmake
[awesomized/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index d024d054ab02e4e6d1e284c7a601930f49f8238e..bfb265cdb5811520b22a45d0a689ac36e29f1a96 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-43,6
+43,7
@@
#include <climits>
#include <cstdlib>
#include <iostream>
#include <climits>
#include <cstdlib>
#include <iostream>
+#include <string>
#include <algorithm>
#include <functional>
#include <algorithm>
#include <functional>
@@
-129,9
+130,8
@@
Server::~Server()
bool Server::check()
{
bool Server::check()
{
- _app.slurp();
- _app.check();
- return true;
+ _app.clear();
+ return _app.check();
}
bool Server::validate()
}
bool Server::validate()
@@
-197,14
+197,6
@@
bool Server::has_pid() const
bool Server::start()
{
bool Server::start()
{
- // If we find that we already have a pid then kill it.
- if (has_pid() == true)
- {
-#if 0
- fatal_message("has_pid() failed, programer error");
-#endif
- }
-
if (getenv("YATL_GDB_SERVER"))
{
_app.use_gdb(true);
if (getenv("YATL_GDB_SERVER"))
{
_app.use_gdb(true);