#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;
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;
return MEMCACHED_BINARY;
}
- const char *pid_file_option()
+ virtual void pid_file_option(Application& app, const std::string& arg)
{
- return "-P ";
+ if (arg.empty() == false)
+ {
+ app.add_option("-P", arg);
+ }
}
const char *socket_file_option() const
return "-d";
}
- const char *log_file_option()
+ virtual void port_option(Application& app, in_port_t arg)
{
- return NULL;
+ char buffer[30];
+ snprintf(buffer, sizeof(buffer), "%d", int(arg));
+ app.add_option("-p", buffer);
+ }
+
+ bool has_port_option() const
+ {
+ return true;
}
- const char *port_option()
+ bool has_socket_file_option() const
{
- return "-p ";
+ return true;
+ }
+
+ void socket_file_option(Application& app, const std::string& socket_arg)
+ {
+ if (socket_arg.empty() == false)
+ {
+ app.add_option("-s", socket_arg);
+ }
}
bool is_libtool()
// 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;
if (getuid() == 0 or geteuid() == 0)
{
- arg_buffer << " -u root ";
+ add_option("-u", "root");
}
- arg_buffer << " -l 127.0.0.1 ";
- arg_buffer << " -m 128 ";
- arg_buffer << " -M ";
+ add_option("-l", "localhost");
+ add_option("-m", "128");
+ add_option("-M");
if (sasl())
{
- arg_buffer << sasl();
+ add_option(sasl());
}
for (int x= 1 ; x < argc ; x++)
{
- arg_buffer << " " << argv[x] << " ";
+ add_option(argv[x]);
}
- set_extra_args(arg_buffer.str());
-
return true;
}