#include <libtest/common.h>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
using namespace libtest;
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (error_is_ok and not wait.successful())
+ if (error_is_ok and not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
}
pid_t local_pid;
- memcached_return_t rc;
+ memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
- local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
+ if (socket().empty())
+ {
+ return -1;
+ }
+
+ local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
}
else
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (error_is_ok and not wait.successful())
+ if (error_is_ok and not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
arg_buffer << " -u root ";
}
- arg_buffer << " -l 127.0.0.1 ";
+ arg_buffer << " -l localhost ";
arg_buffer << " -m 128 ";
arg_buffer << " -M ";