projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of cppccheck fixes.
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index b8838a06a495bd4bbdf8702daf523e1d1953600d..d92944f6bfeb1bd9cec17320229cd880f3edb6f6 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-97,6
+97,7
@@
public:
libtest::Server(host_arg, port_arg,
MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg)
{
libtest::Server(host_arg, port_arg,
MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg)
{
+ set_pid_file();
}
virtual const char *sasl() const
}
virtual const char *sasl() const
@@
-114,13
+115,27
@@
public:
return _username;
}
return _username;
}
-
virtual bool has_pid_
file() const
+
bool wait_for_pid
file() const
{
{
- return false;
+ Wait wait(pid(), 4);
+
+ return wait.successful();
}
bool ping()
{
}
bool ping()
{
+#if 0
+ // Memcached is slow to start, so we need to do this
+ if (pid_file().empty() == false)
+ {
+ if (wait_for_pidfile() == false)
+ {
+ Error << "Pidfile was not found:" << pid_file() << " :" << running();
+ return -1;
+ }
+ }
+#endif
+
memcached_return_t rc;
bool ret;
memcached_return_t rc;
bool ret;