projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-115
[m6w6/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index 23ea8d74a8bb8fdbdb38f4ffda96ce1f767359d3..01d15625bf043e2712dccf8658899c40aafa8b53 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-210,6
+210,7
@@
bool Server::start()
_app.use_valgrind();
}
_app.use_valgrind();
}
+ out_of_ban_killed(false);
if (args(_app) == false)
{
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
if (args(_app) == false)
{
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
@@
-268,7
+269,7
@@
bool Server::start()
bool pinged= false;
uint32_t this_wait= 0;
{
bool pinged= false;
uint32_t this_wait= 0;
{
- uint32_t timeout=
2
0; // This number should be high enough for valgrind startup (which is slow)
+ uint32_t timeout=
4
0; // This number should be high enough for valgrind startup (which is slow)
uint32_t waited;
uint32_t retry;
uint32_t waited;
uint32_t retry;